torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson
2019-08-26 10:15:25 -04:00
parent 24bc2cd7b5 bdcccb9776
commit eff95429fd
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug31462
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes (git hooks):
- Remove a duplicate call to practracker from the pre-push hook.
The pre-push hook already calls the pre-commit hook, which calls
practracker. Fixes bug 31462; bugfix on 0.4.1.1-alpha.
changes/ticket30979
+5 -3
View File
@@ -1,5 +1,7 @@
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.
- Our pre-commit git hook now checks for a special file
before running practracker, so that practracker only runs on branches
that are based on master. Since the pre-push hook calls the pre-commit
hook, practracker will also only run before pushes of branches based
on master.
Closes ticket 30979.