diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-28 13:42:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 13:42:55 -0800 |
| commit | 2f739695700e4a9d9de640ff623fe4e728f5b23a (patch) | |
| tree | b6f76121a20097d66a8d55f158f5e3a0dc2cecd3 /t | |
| parent | 0ec9ee3bcf5c926df9d54f63ff3ed8b97e19bb0d (diff) | |
| parent | 7b3b7e37581fb5266a260687c21af1571b4ade81 (diff) | |
| download | git-2f739695700e4a9d9de640ff623fe4e728f5b23a.tar.gz | |
Merge branch 'jc/maint-am-abort-safely' into maint
* jc/maint-am-abort-safely:
am --abort: keep unrelated commits since the last failure and warn
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4151-am-abort.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index b55c411788..c95c4ccc39 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 |