#29532: Update git pre-push hook so that only upstream branches can get pushed to origin #717
Conversation
rl1987
force-pushed
the
feature29532
branch
2 times, most recently
from
15b39b0
to
30f669c
nmathewson
requested changes
Feb 20, 2019
nmathewson
reviewed
Feb 20, 2019
scripts/maint/pre-push.git-hook
Outdated
| @@ -52,6 +43,19 @@ do | |||
| range="$remote_sha..$local_sha" | |||
| fi | |||
|
|
|||
| if ref_is_upstream_branch "$local_ref" == 0 || | |||
Should we be checking local_ref at all, or only remote_ref ?
I suppose we should check both, to cover weird situations of local regular branch being pushed to remote upstream branch, and vice versa?
In that case, I think we should explicitly check for match; pushing maint-0.3.5 to maint-0.3.4 is as bad as pushing bug12345 to maint-0.3.4.
nmathewson
reviewed
Feb 24, 2019
scripts/maint/pre-push.git-hook
Outdated
| ref_is_upstream_branch "$remote_ref" == 0 | ||
| if (ref_is_upstream_branch "$local_ref" == 0 || | ||
| ref_is_upstream_branch "$remote_ref" == 0) && | ||
| "$local_ref" ne "$remote_ref" |
Does this part need to be in [square brackets] ?
Shellcheck does not complain about this, so I think not? Then again I'm really not sure.
On second thought, let's use [...] for consistency with previous code. See e28bbc8.
…ch names do not match
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
https://trac.torproject.org/projects/tor/ticket/29532
The text was updated successfully, but these errors were encountered: