summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-12 21:28:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-12 21:28:01 (GMT)
commitb4f0038525623e0e5aa3b35d520de909618cae98 (patch)
tree5f4056c2fed1880f4faddb834691ebda724bbf0e /t
parenta56d361f66a78cabaf594b611d817a528ad1d489 (diff)
parent120b1eb7314687375e0a229e102ffd194cae0e06 (diff)
downloadgit-b4f0038525623e0e5aa3b35d520de909618cae98.zip
git-b4f0038525623e0e5aa3b35d520de909618cae98.tar.gz
git-b4f0038525623e0e5aa3b35d520de909618cae98.tar.bz2
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-xt/t3424-rebase-empty.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3424-rebase-empty.sh b/t/t3424-rebase-empty.sh
index 98fc2a5..e1e3051 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