diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-12 14:28:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-12 14:28:01 -0700 |
| commit | b4f0038525623e0e5aa3b35d520de909618cae98 (patch) | |
| tree | 5f4056c2fed1880f4faddb834691ebda724bbf0e /t | |
| parent | Merge branch 'ds/sparse-add' (diff) | |
| parent | git-rebase.txt: highlight backend differences with commit rewording (diff) | |
| download | tgif-b4f0038525623e0e5aa3b35d520de909618cae98.tar.xz | |
Merge branch 'en/rebase-backend'
Band-aid fixes for two fallouts from switching the default "rebase"
backend.
* en/rebase-backend:
git-rebase.txt: highlight backend differences with commit rewording
sequencer: clear state upon dropping a become-empty commit
i18n: unmark a message in rebase.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3424-rebase-empty.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3424-rebase-empty.sh b/t/t3424-rebase-empty.sh index 98fc2a558a..e1e30517ea 100755 --- a/t/t3424-rebase-empty.sh +++ b/t/t3424-rebase-empty.sh @@ -123,4 +123,12 @@ test_expect_success 'rebase --interactive uses default of --empty=ask' ' test_cmp expect actual ' +test_expect_success 'rebase --merge does not leave state laying around' ' + git checkout -B testing localmods~2 && + git rebase --merge upstream && + + test_path_is_missing .git/CHERRY_PICK_HEAD && + test_path_is_missing .git/MERGE_MSG +' + test_done |