aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-10 17:28:13 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-10 17:28:13 +1200
commitb777cd20189ff9d7653ca7672039d5d9f848b81e (patch)
treea765f79c33083edae996bc3e5ba60ca9aaed08ff
parentMerge branch 'release/v5.34.0' (diff)
downloaddotfiles-b777cd20189ff9d7653ca7672039d5d9f848b81e.tar.gz
dotfiles-b777cd20189ff9d7653ca7672039d5d9f848b81e.zip
Allow merge commits to master
-rw-r--r--git/template/hooks/pre-commit.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/git/template/hooks/pre-commit.sh b/git/template/hooks/pre-commit.sh
index 22e876ad..f0e093b3 100644
--- a/git/template/hooks/pre-commit.sh
+++ b/git/template/hooks/pre-commit.sh
@@ -7,6 +7,9 @@
# Allow commit if there's no develop branch
git show-ref --quiet --verify refs/heads/develop || exit 0
+# Allow commit if it's a merge. Is there a better way to test this?
+! git rev-parse --quiet --verify MERGE_HEAD >/dev/null || exit 0
+
# Throw toys
printf >&2 'Branch develop exists, commits to master blocked\n'
exit 1