commit 91f04d006bb850736df587e2942fedcc26d3dca9 parent ab1f82ea2a3ef9f9bc920885e40e7b477b3dfb93 Author: George Kadianakis <desnacked@riseup.net> Date: Wed, 24 Jul 2019 12:29:57 +0300 Merge branch 'tor-github/pr/1165' Diffstat:
| A | changes/bug31040 | | | 3 | +++ |
| M | scripts/git/post-merge.git-hook | | | 6 | ++++++ |
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/changes/bug31040 b/changes/bug31040 @@ -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. diff --git a/scripts/git/post-merge.git-hook b/scripts/git/post-merge.git-hook @@ -35,6 +35,12 @@ check_for_script_update() { 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-commit" check_for_diffs "post-merge"