Add tests which make sure that the pre-commit hook is called by 'git
merge' when merge.usePreCommitHook is set, allows/disallows merge
commits depending on its return value and is suppressed by
"--no-verify".
Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net>
---
t/t7503-pre-commit-hook.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-hook.sh
index 984889b..e4d324d 100755
--- a/t/t7503-pre-commit-hook.sh
+++ b/t/t7503-pre-commit-hook.sh
@@ -4,6 +4,19 @@ test_description='pre-commit hook'
. ./test-lib.sh
+test_expect_success 'root commit' '
+
+ echo "root" > file &&
+ git add file &&
+ git commit -m "zeroth" &&
+ git checkout -b side &&
+ echo "foo" > foo &&
+ git add foo &&
+ git commit -m "make it non-ff" &&
+ git checkout master
+
+'
+
test_expect_success 'with no hook' '
echo "foo" > file &&
@@ -12,6 +25,14 @@ test_expect_success 'with no hook' '
'
+test_expect_success 'with no hook (merge)' '
+
+ git checkout side &&
+ git merge -m "merge master" master &&
+ git checkout master
+
+'
+
test_expect_success '--no-verify with no hook' '
echo "bar" > file &&
@@ -20,6 +41,14 @@ test_expect_success '--no-verify with no hook' '
'
+test_expect_success '--no-verify with no hook (merge)' '
+
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master
+
+'
+
# now install hook that always succeeds
HOOKDIR="$(git rev-parse --git-dir)/hooks"
HOOK="$HOOKDIR/pre-commit"
@@ -29,6 +58,7 @@ cat > "$HOOK" <<EOF
exit 0
EOF
chmod +x "$HOOK"
+git config merge.usePreCommitHook true
test_expect_success 'with succeeding hook' '
@@ -38,6 +68,14 @@ test_expect_success 'with succeeding hook' '
'
+test_expect_success 'with succeeding hook (merge)' '
+
+ git checkout side &&
+ git merge -m "merge master" master &&
+ git checkout master
+
+'
+
test_expect_success '--no-verify with succeeding hook' '
echo "even more" >> file &&
@@ -46,6 +84,14 @@ test_expect_success '--no-verify with succeeding hook' '
'
+test_expect_success '--no-verify with succeeding hook (merge)' '
+
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master
+
+'
+
# now a hook that fails
cat > "$HOOK" <<EOF
#!/bin/sh
@@ -68,6 +114,22 @@ test_expect_success '--no-verify with failing hook' '
'
+test_expect_success 'with failing hook (merge)' '
+
+ git checkout side &&
+ test_must_fail git merge -m "merge master" master &&
+ git checkout master
+
+'
+
+test_expect_success '--no-verify with failing hook (merge)' '
+
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master
+
+'
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
--
1.7.12.406.gafd3f81
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
