diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-01-16 23:07:46 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-01-16 23:07:46 +0300 |
commit | b242e89dff9cc5c736bcf3629df9564a98ff23db (patch) | |
tree | 58d5c88cc3672e4648bc799ce00cb69a50b11549 /t/t4150-am.sh | |
parent | 763f20fb4ad3108634b05f45b575d95ed13ab861 (diff) | |
parent | 566902f2db3bdad9be7fb083c713f0d21acf111e (diff) |
Merge branch 'tr/am--no-verify'
Conditionally skip the pre-applypatch and applypatch-msg hooks when
applying patches with 'git am'.
* tr/am--no-verify:
am: allow passing --no-verify flag
Diffstat (limited to 't/t4150-am.sh')
-rwxr-xr-x | t/t4150-am.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 7646e856d5..78cf1c880e 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -345,6 +345,21 @@ test_expect_success 'am with failing applypatch-msg hook' ' test_cmp_rev first HEAD ' +test_expect_success 'am with failing applypatch-msg hook (no verify)' ' + rm -fr .git/rebase-apply && + git reset --hard && + git checkout first && + test_hook applypatch-msg <<-\EOF && + echo hook-message >"$1" + exit 1 + EOF + git am --no-verify patch1 && + test_path_is_missing .git/rebase-apply && + git diff --exit-code second && + git log -1 --format=format:%B >actual && + test_cmp msg actual +' + test_expect_success 'am with pre-applypatch hook' ' rm -fr .git/rebase-apply && git reset --hard && @@ -374,6 +389,23 @@ test_expect_success 'am with failing pre-applypatch hook' ' test_cmp_rev first HEAD ' +test_expect_success 'am with failing pre-applypatch hook (no verify)' ' + rm -fr .git/rebase-apply && + git reset --hard && + git checkout first && + touch empty-file && + test_hook pre-applypatch <<-\EOF && + rm empty-file + exit 1 + EOF + git am --no-verify patch1 && + test_path_is_missing .git/rebase-apply && + test_path_is_file empty-file && + git diff --exit-code second && + git log -1 --format=format:%B >actual && + test_cmp msg actual +' + test_expect_success 'am with post-applypatch hook' ' rm -fr .git/rebase-apply && git reset --hard && |