From: rl1987 <rl1987@sdf.lonestar.org>
Date: Tue, 2 Jul 2019 17:06:23 +0000 (+0300)
Subject: Early exit from post-merge git hook script when not merging to master
X-Git-Tag: tor-0.4.2.1-alpha~127^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59e523f058ee0953deacf1370d546cabd192584d;p=thirdparty%2Ftor.git

Early exit from post-merge git hook script when not merging to master
---

diff --git a/changes/bug31040 b/changes/bug31040
new file mode 100644
index 0000000000..81f6d7e795
--- /dev/null
+++ 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
index 176b7c9bbd..eae4f999e7 100755
--- 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"