diff options
| author | Elijah Newren <newren@gmail.com> | 2021-09-10 10:31:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 22:51:15 (GMT) |
| commit | c5ead19ea282a288e01d86536349a4ae4a093e4b (patch) | |
| tree | e996a253543c31cb895adbbf9f3d64a3f3af020f /t/t4151-am-abort.sh | |
| parent | 42b5e09d1e555689168941eb639be644d004cb9d (diff) | |
| download | git-c5ead19ea282a288e01d86536349a4ae4a093e4b.zip git-c5ead19ea282a288e01d86536349a4ae4a093e4b.tar.gz git-c5ead19ea282a288e01d86536349a4ae4a093e4b.tar.bz2 | |
am: fix incorrect exit status on am fail to abort
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4151-am-abort.sh')
| -rwxr-xr-x | t/t4151-am-abort.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 15f2f92..2374151 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -197,7 +197,7 @@ test_expect_success 'am --abort leaves index stat info alone' ' git diff-files --exit-code --quiet ' -test_expect_failure 'git am --abort return failed exit status when it fails' ' +test_expect_success 'git am --abort return failed exit status when it fails' ' test_when_finished "rm -rf file-2/ && git reset --hard && git am --abort" && git checkout changes && git format-patch -1 --stdout conflicting >changes.mbox && |