X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3401-rebase-partial.sh;h=8b19d3ccea5a0d5ff697661202347fbdfc6c330a;hb=d77ee72662a821d66ae218056f0103eb24d8d4b4;hp=32dc9c5e74e80e2483ae0bf49f3dfd549c6d8471;hpb=521a3f676794987bfd03703fe58fbec46ed69d49;p=git.git

diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
index 32dc9c5e7..8b19d3cce 100755
--- a/t/t3401-rebase-partial.sh
+++ b/t/t3401-rebase-partial.sh
@@ -37,7 +37,9 @@ test_expect_success \
 test_expect_success \
     'pick top patch from topic branch into master' \
     'git-cherry-pick my-topic-branch^0 &&
-     git-checkout -f my-topic-branch
+     git-checkout -f my-topic-branch &&
+     git-branch master-merge master &&
+     git-branch my-topic-branch-merge my-topic-branch
 '
 
 test_debug \
@@ -50,4 +52,10 @@ test_expect_success \
     'rebase topic branch against new master and check git-am did not get halted' \
     'git-rebase master && test ! -d .dotest'
 
+test_expect_success \
+	'rebase --merge topic branch that was partially merged upstream' \
+	'git-checkout -f my-topic-branch-merge &&
+	 git-rebase --merge master-merge &&
+	 test ! -d .git/.dotest-merge'
+
 test_done