Skip to content
Permalink
Browse files
pre-push.git-hook: Allow fixup and squash commits when pushing to non…
…-upstream branches
  • Loading branch information
rl1987 committed May 1, 2019
1 parent 39bd10d commit d91deeee45c3433cc7dcaf1e67a84692420db870
Showing with 18 additions and 10 deletions.
  1. +18 −10 scripts/git/pre-push.git-hook
@@ -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

0 comments on commit d91deee

Please sign in to comment.