diff options
| author | Johan Herland <johan@herland.net> | 2014-09-03 16:03:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-03 14:15:45 -0700 |
| commit | 9127e0a9cef02707c78f775088ce09785e510a1c (patch) | |
| tree | 43e22ab0250ff46471c41440d5f893fe04bebd14 /t/t7503-pre-commit-hook.sh | |
| parent | e47ef978b58d5178cd3334dea215114d76d825ab (diff) | |
| download | git-9127e0a9cef02707c78f775088ce09785e510a1c.tar.gz | |
revert/cherry-pick: add --no-verify option, and pass it on to commit
Allow users to temporarily disable the pre-commit and commit-msg hooks
when running "git revert" or "git cherry-pick", just like they currently
can for "git commit".
The --no-verify option is added to the sequencer machinery and handled
like the other commit-related options.
This fixes the failing t7503/t7504 test cases added previously.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7503-pre-commit-hook.sh')
| -rwxr-xr-x | t/t7503-pre-commit-hook.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-hook.sh index adc892b3a8..b0307f424a 100755 --- a/t/t7503-pre-commit-hook.sh +++ b/t/t7503-pre-commit-hook.sh @@ -80,13 +80,13 @@ test_expect_success '--no-verify with failing hook' ' ' -test_expect_failure 'revert --no-verify with failing hook' ' +test_expect_success 'revert --no-verify with failing hook' ' git revert --no-verify HEAD ' -test_expect_failure 'cherry-pick --no-verify with failing hook' ' +test_expect_success 'cherry-pick --no-verify with failing hook' ' git cherry-pick --no-verify HEAD^ |