Merge branch 'tor-github/pr/1220'

changes/ticket30979

@@ -0,0 +1,5 @@
+  o Minor features (git hooks):
+    - Our pre-push git hook now checks for a special file
+      before running practracker, so that it only runs on branches
+      that are based on master.
+      Closes ticket 30979.

scripts/git/pre-push.git-hook

@@ -28,10 +28,14 @@ if [ -x "$workdir/.git/hooks/pre-commit" ]; then
   fi
 fi
 
-if [ -e scripts/maint/practracker/practracker.py ]; then
+PT_DIR=scripts/maint/practracker
-  if ! python3 ./scripts/maint/practracker/practracker.py "$workdir"; then
+
-    exit 1
+if [ -e "${PT_DIR}/practracker.py" ]; then
-  fi
+    if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then
+        if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then
+            exit 1
+        fi
+    fi
 fi
 
 remote="$1"
@@ -104,4 +108,3 @@ do
 done
 
 exit 0
-

scripts/maint/practracker/.enable_practracker_in_hooks

@@ -0,0 +1 @@
+This file is present to tell our git hooks to run practracker on this branch.