The revert/cherry-pick machinery currently exercises the pre-commit
and commit-msg hooks. However, where commit accepts a --no-verify
option to temporarily disable these hooks, the revert and cherry-pick
commands have no such option.
This patch adds some testcases demonstrating how the --no-verify
option is supposed when it is added to revert and cherry-pick
(in the next patch).
Signed-off-by: Johan Herland <jo...@herland.net>
---
t/t7503-pre-commit-hook.sh | 24 ++++++++++++++++++++++++
t/t7504-commit-msg-hook.sh | 24 ++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-hook.sh
index 984889b..adc892b 100755
--- a/t/t7503-pre-commit-hook.sh
+++ b/t/t7503-pre-commit-hook.sh
@@ -60,6 +60,18 @@ test_expect_success 'with failing hook' '
'
+test_expect_success 'revert with failing hook' '
+
+ test_must_fail git revert HEAD
+
+'
+
+test_expect_success 'cherry-pick with failing hook' '
+
+ test_must_fail git cherry-pick --no-verify HEAD^
+
+'
+
test_expect_success '--no-verify with failing hook' '
echo "stuff" >> file &&
@@ -68,6 +80,18 @@ test_expect_success '--no-verify with failing hook' '
'
+test_expect_failure 'revert --no-verify with failing hook' '
+
+ git revert --no-verify HEAD
+
+'
+
+test_expect_failure 'cherry-pick --no-verify with failing hook' '
+
+ git cherry-pick --no-verify HEAD^
+
+'
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 1f53ea8..4f8b9fe 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -109,6 +109,18 @@ test_expect_success 'with failing hook' '
'
+test_expect_success 'revert with failing hook' '
+
+ test_must_fail git revert HEAD
+
+'
+
+test_expect_success 'cherry-pick with failing hook' '
+
+ test_must_fail git cherry-pick --no-verify HEAD^
+
+'
+
test_expect_success 'with failing hook (editor)' '
echo "more another" >> file &&
@@ -126,6 +138,18 @@ test_expect_success '--no-verify with failing hook' '
'
+test_expect_failure 'revert --no-verify with failing hook' '
+
+ git revert --no-verify HEAD
+
+'
+
+test_expect_failure 'cherry-pick --no-verify with failing hook' '
+
+ git cherry-pick --no-verify HEAD^
+
+'
+
test_expect_success '--no-verify with failing hook (editor)' '
echo "more stuff" >> file &&
--
2.0.0.rc4.501.gdaf83ca
--
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
