diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-23 12:51:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-23 12:51:44 -0400 |
| commit | b0459de217cdc18d20754ad1495ed1da52885c81 (patch) | |
| tree | 3f24362c207dfbd847b9078136d8ee2957fa583d /scripts | |
| parent | a7599c5be2cd9b02a2b0e9760a6762a623fd0d7b (diff) | |
| parent | 0c78811ceabaece8bec92cc6a9a42a7b4631cfa7 (diff) | |
| download | tor-b0459de217cdc18d20754ad1495ed1da52885c81.tar.gz tor-b0459de217cdc18d20754ad1495ed1da52885c81.zip | |
Merge branch 'ticket30051_take2_squashed'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/git/pre-commit.git-hook | 4 | ||||
| -rwxr-xr-x | scripts/git/pre-push.git-hook | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 65fa99f4c4..76d13adeb9 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -39,3 +39,7 @@ fi if test -e scripts/maint/checkIncludes.py; then python scripts/maint/checkIncludes.py fi + +if [ -e scripts/maint/practracker/practracker.py ]; then + python3 ./scripts/maint/practracker/practracker.py "$workdir" +fi diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index f329829346..740180d6f6 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -34,6 +34,12 @@ if [ -x "$workdir/.git/hooks/pre-commit" ]; then fi fi +if [ -e scripts/maint/practracker/practracker.py ]; then + if ! python3 ./scripts/maint/practracker/practracker.py "$workdir"; then + exit 1 + fi +fi + # shellcheck disable=SC2034 while read -r local_ref local_sha remote_ref remote_sha do |