Merge branch 'tor-github/pr/1165'

2024-12-06 19:41:15 +01:00 · 2019-07-24 12:29:57 +03:00
parent ab1f82ea2a 59e523f058
commit 91f04d006b
2 changed files with 9 additions and 0 deletions
@@ -35,6 +35,12 @@ check_for_script_update() {
        fi
 }

+cur_branch=$(git rev-parse --abbrev-ref HEAD)
+if [ "$cur_branch" != "master" ]; then
+  echo "post-merge: Not a master branch. Skipping."
+  exit 0
+fi
+
 check_for_diffs "pre-push"
 check_for_diffs "pre-commit"
 check_for_diffs "post-merge"