[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1241'

[nickm@xxxxxxxxxxxxxx]

commit eff95429fd5fd1e7a9431c7ccdbe89310c4b9704
Merge: 24bc2cd7b bdcccb977
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Aug 26 10:15:25 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1241'

 changes/bug31462                |  4 ++++
 changes/ticket30979             |  8 +++++---
 scripts/git/pre-commit.git-hook | 16 +++++++++++++---
 scripts/git/pre-push.git-hook   | 18 +++++++-----------
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --cc scripts/git/pre-commit.git-hook
index 7c7cf8857,37060fdbe..b2a1847a2
--- a/scripts/git/pre-commit.git-hook
+++ b/scripts/git/pre-commit.git-hook
@@@ -36,10 -37,19 +37,19 @@@ elif [ -d src/common ]; the
           src/tools/*.[ch]
  fi
  
 -if test -e scripts/maint/checkIncludes.py; then
 -    python scripts/maint/checkIncludes.py
 +if test -e scripts/maint/practracker/includes.py; then
 +    python scripts/maint/practracker/includes.py
  fi
  
- if [ -e scripts/maint/practracker/practracker.py ]; then
-   python3 ./scripts/maint/practracker/practracker.py "$workdir"
+ # Only call practracker if ${PT_DIR}/.enable_practracker_in_hooks exists
+ # We do this check so that we can enable practracker in hooks in master, and
+ # disable it on maint branches
+ PT_DIR=scripts/maint/practracker
+ 
+ if [ -e "${PT_DIR}/practracker.py" ]; then
+     if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then
+         if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then
+             exit 1
+         fi
+     fi
  fi

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits