diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-28 21:37:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-28 21:37:52 (GMT) |
| commit | c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb (patch) | |
| tree | 0f8bdd53d9cad7b369c0e120cdff23bff40bdd27 /t | |
| parent | 2fc74f41c50562d76defa0617db5bcb7e5216272 (diff) | |
| parent | 65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e (diff) | |
| download | git-c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb.zip git-c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb.tar.gz git-c22c624a9de3576d6e66f81c3a1edc6dfcfb08bb.tar.bz2 | |
Merge branch 'nd/am-quit'
"git am" has learned the "--quit" option, in addition to the existing
"--abort" option; having the pair mirrors a few other commands like
"rebase" and "cherry-pick".
* nd/am-quit:
am: support --quit
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4150-am.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 73b67b4..512c754e 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -1045,4 +1045,16 @@ test_expect_success 'am works with multi-line in-body headers' ' git cat-file commit HEAD | grep "^$LONG$" ' +test_expect_success 'am --quit keeps HEAD where it is' ' + mkdir .git/rebase-apply && + >.git/rebase-apply/last && + >.git/rebase-apply/next && + git rev-parse HEAD^ >.git/ORIG_HEAD && + git rev-parse HEAD >expected && + git am --quit && + test_path_is_missing .git/rebase-apply && + git rev-parse HEAD >actual && + test_cmp expected actual +' + test_done |