From b777cd20189ff9d7653ca7672039d5d9f848b81e Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 10 Jun 2019 17:28:13 +1200 Subject: Allow merge commits to master --- git/template/hooks/pre-commit.sh | 3 +++ 1 file changed, 3 insertions(+) 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 -- cgit v1.2.3 From 25cd9d247007aec8f1e816cb28fea44523425bf7 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 10 Jun 2019 17:28:27 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index c37a7818..2ea79f43 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v5.34.0 -Mon Jun 10 05:03:19 UTC 2019 +tejr dotfiles v5.34.1 +Mon Jun 10 05:28:24 UTC 2019 -- cgit v1.2.3