X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4151-am-abort.sh;h=c95c4ccc393d0863ad53b6a2a684893282d7d9e6;hb=698a9ab3f104b369e41ad26ad0bdaedc3a1d5f4f;hp=b55c4117884744db8eda17e42fe05e0e65216215;hpb=20cb8e202520173727f3ea060e1eca035b32e2b7;p=git.git diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index b55c41178..c95c4ccc3 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -62,4 +62,13 @@ do done +test_expect_success 'am --abort will keep the local commits intact' ' + test_must_fail git am 0004-*.patch && + test_commit unrelated && + git rev-parse HEAD >expect && + git am --abort && + git rev-parse HEAD >actual && + test_cmp expect actual +' + test_done