mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1165'

Browse source
This commit is contained in:
George Kadianakis 2019-07-24 12:29:57 +03:00
commit 91f04d006b
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug31040 Normal file
View file

@ -0,0 +1,3 @@
o Minor bugfixes (developer tooling):
- Only log git script changes in post-merge script when merge was to the
master branch. Fixes bug 31040; bugfix on 0.4.1.1-alpha.

6
scripts/git/post-merge.git-hook
View file

@ -35,6 +35,12 @@ check_for_script_update() {
fi fi
} }
cur_branch=$(git rev-parse --abbrev-ref HEAD)
if [ "$cur_branch" != "master" ]; then
echo "post-merge: Not a master branch. Skipping."
exit 0
fi
check_for_diffs "pre-push" check_for_diffs "pre-push"
check_for_diffs "pre-commit" check_for_diffs "pre-commit"
check_for_diffs "post-merge" check_for_diffs "post-merge"