Browse Source

pre-push.git-hook: Check remote name to see if it's upstream

rl1987 5 years ago
parent
commit
6f1527f888
1 changed files with 4 additions and 2 deletions
  1. 4 2
      scripts/git/pre-push.git-hook

+ 4 - 2
scripts/git/pre-push.git-hook

@@ -16,6 +16,7 @@ echo "Running pre-push hook"
 
 z40=0000000000000000000000000000000000000000
 
+upstream_name=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
 
 workdir=$(git rev-parse --show-toplevel)
 if [ -x "$workdir/.git/hooks/pre-commit" ]; then
@@ -33,8 +34,9 @@ fi
 remote="$1"
 remote_loc="$2"
 
-if [[ "$remote_loc" != *github.com/torproject/tor.git ]] &&
-   [[ "$remote_loc" != *torproject.org/tor.git ]]; then
+remote_name=$(git remote --verbose | grep "$2" | awk '{print $1}' | head -n 1)
+
+if [[ "$remote_name" != "$upstream_name" ]]; then
   echo "Not pushing to upstream - refraining from further checks"
   exit 0
 fi