diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-08-26 10:15:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-08-26 10:15:25 -0400 |
| commit | eff95429fd5fd1e7a9431c7ccdbe89310c4b9704 (patch) | |
| tree | eb6d54f7c16524385e588e766fa640059ccec730 /scripts/git/pre-commit.git-hook | |
| parent | 24bc2cd7b5ab32d6a34dee3a27d5d383a383b270 (diff) | |
| parent | bdcccb97769b2247e22cb8e1dc05b8274d46fafd (diff) | |
| download | tor-eff95429fd5fd1e7a9431c7ccdbe89310c4b9704.tar.gz tor-eff95429fd5fd1e7a9431c7ccdbe89310c4b9704.zip | |
Merge remote-tracking branch 'tor-github/pr/1241'
Diffstat (limited to 'scripts/git/pre-commit.git-hook')
| -rwxr-xr-x | scripts/git/pre-commit.git-hook | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 7c7cf88574..b2a1847a2b 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -4,7 +4,8 @@ # tor git repo and make sure it has permission to execute. # # This is pre-commit git hook script that prevents commiting your changeset if -# it fails our code formatting or changelog entry formatting checkers. +# it fails our code formatting, changelog entry formatting, module include +# rules, or best practices tracker. workdir=$(git rev-parse --show-toplevel) @@ -40,6 +41,15 @@ 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 |