From: Johan Herland <johan@herland.net>
To: git@vger.kernel.org
Cc: "Lars Gullik Bjønnes" <larsbj@gullik.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Neil Horman" <nhorman@tuxdriver.com>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Johan Herland" <johan@herland.net>
Subject: [RFC/PATCH 1/3] t7503/4: Add failing testcases for revert/cherry-pick --no-verify
Date: Wed, 3 Sep 2014 16:03:52 +0200 [thread overview]
Message-ID: <1409753034-9459-2-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1409753034-9459-1-git-send-email-johan@herland.net>
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 <johan@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
next prev parent reply other threads:[~2014-09-03 14:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 14:03 [RFC/PATCH 0/3] Teach revert/cherry-pick the --no-verify option Johan Herland
2014-09-03 14:03 ` Johan Herland [this message]
2014-09-03 19:28 ` [RFC/PATCH 1/3] t7503/4: Add failing testcases for revert/cherry-pick --no-verify Junio C Hamano
2014-09-03 14:03 ` [RFC/PATCH 2/3] revert/cherry-pick: Add --no-verify option, and pass it on to commit Johan Herland
2014-09-03 19:32 ` Junio C Hamano
2014-09-03 19:42 ` [PATCH] parse-options: detect attempt to add a duplicate short option name Junio C Hamano
2014-09-03 20:29 ` René Scharfe
2014-09-03 21:05 ` Junio C Hamano
2014-09-03 21:46 ` René Scharfe
2014-09-03 22:16 ` Junio C Hamano
2014-09-04 6:13 ` René Scharfe
2014-09-04 17:24 ` Junio C Hamano
2014-09-04 18:07 ` Junio C Hamano
2014-09-03 21:46 ` Jonathan Nieder
2014-09-03 21:58 ` Jonathan Nieder
2014-09-04 8:34 ` [RFC/PATCH 2/3] revert/cherry-pick: Add --no-verify option, and pass it on to commit Johan Herland
2014-09-03 14:03 ` [RFC/PATCH 3/3] revert/cherry-pick --no-verify: Update documentation Johan Herland
2014-09-03 19:21 ` [RFC/PATCH 0/3] Teach revert/cherry-pick the --no-verify option Junio C Hamano
2014-09-05 21:05 ` Fabian Ruch
2014-09-08 15:13 ` Johan Herland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409753034-9459-2-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsbj@gullik.org \
--cc=nhorman@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).