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 /changes | |
| 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 'changes')
| -rw-r--r-- | changes/bug31462 | 4 | ||||
| -rw-r--r-- | changes/ticket30979 | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/changes/bug31462 b/changes/bug31462 new file mode 100644 index 0000000000..54ab990bb8 --- /dev/null +++ b/changes/bug31462 @@ -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. diff --git a/changes/ticket30979 b/changes/ticket30979 index 8ae9b3c418..ffe1bfb4ab 100644 --- a/changes/ticket30979 +++ b/changes/ticket30979 @@ -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. |