nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1220'

Browse Source
This commit is contained in:
George Kadianakis 2019-08-19 18:02:44 +03:00
commit e411fcabd7
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket30979 Normal file
View File

@ -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.

9
scripts/git/pre-push.git-hook
View File

@ -28,10 +28,14 @@ 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
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
remote="$1"
@ -104,4 +108,3 @@ do
done
exit 0

1
scripts/maint/practracker/.enable_practracker_in_hooks Normal file
View File

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