pre-push.git-hook: Allow fixup and squash commits when pushing to non-upstream branches

This commit is contained in:
rl1987 2019-05-01 12:41:49 +03:00
parent 39bd10dca6
commit d91deeee45

View File

@ -16,16 +16,6 @@ echo "Running pre-push hook"
z40=0000000000000000000000000000000000000000
remote="$1"
ref_is_upstream_branch() {
if [ "$1" == "refs/heads/master" ] ||
[[ "$1" == refs/heads/release-* ]] ||
[[ "$1" == refs/heads/maint-* ]]
then
return 1
fi
}
workdir=$(git rev-parse --show-toplevel)
if [ -x "$workdir/.git/hooks/pre-commit" ]; then
@ -40,6 +30,24 @@ if [ -e scripts/maint/practracker/practracker.py ]; then
fi
fi
remote="$1"
remote_loc="$2"
if [[ "$remote_loc" != *github.com/torproject/tor.git ]] &&
[[ "$remote_loc" != *torproject.org/tor.git ]]; then
echo "Not pushing to upstream - refraining from further checks"
exit 0
fi
ref_is_upstream_branch() {
if [ "$1" == "refs/heads/master" ] ||
[[ "$1" == refs/heads/release-* ]] ||
[[ "$1" == refs/heads/maint-* ]]
then
return 1
fi
}
# shellcheck disable=SC2034
while read -r local_ref local_sha remote_ref remote_sha
do