diff options
| -rwxr-xr-x | git-am.sh | 2 | ||||
| -rwxr-xr-x | t/t4151-am-abort.sh | 11 |
2 files changed, 12 insertions, 1 deletions
@@ -86,7 +86,7 @@ safe_to_abort () { return 1 fi - if ! test -s "$dotest/abort-safety" + if ! test -f "$dotest/abort-safety" then return 0 fi diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index dc6b3b0c7c..1274f75a60 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -142,4 +142,15 @@ test_expect_success 'am -3 --abort on unborn branch removes applied commits' ' test refs/heads/orphan = "$(git symbolic-ref HEAD)" ' +test_expect_success 'am --abort on unborn branch will keep local commits intact' ' + git checkout -f --orphan orphan && + git reset && + test_must_fail git am 0004-*.patch && + test_commit unrelated2 && + git rev-parse HEAD >expect && + git am --abort && + git rev-parse HEAD >actual && + test_cmp expect actual +' + test_done |