1 files changed, 23 insertions, 31 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
index 32dc9c5e74..7ba17974c5 100755
--- a/t/t3401-rebase-partial.sh
+++ b/t/t3401-rebase-partial.sh
@@ -11,43 +11,35 @@ local branch.
 '
 . ./test-lib.sh
 
-test_expect_success \
-    'prepare repository with topic branch' \
-    'echo First > A &&
-     git-update-index --add A &&
-     git-commit -m "Add A." &&
-
-     git-checkout -b my-topic-branch &&
-
-     echo Second > B &&
-     git-update-index --add B &&
-     git-commit -m "Add B." &&
-
-     echo AnotherSecond > C &&
-     git-update-index --add C &&
-     git-commit -m "Add C." &&
-
-     git-checkout -f master &&
+test_expect_success 'prepare repository with topic branch' '
+	test_commit A &&
+	git checkout -b my-topic-branch &&
+	test_commit B &&
+	test_commit C &&
+	git checkout -f master &&
+	test_commit A2 A.t
+'
 
-     echo Third >> A &&
-     git-update-index A &&
-     git-commit -m "Modify A."
+test_expect_success 'pick top patch from topic branch into master' '
+	git cherry-pick C &&
+	git checkout -f my-topic-branch
 '
 
-test_expect_success \
-    'pick top patch from topic branch into master' \
-    'git-cherry-pick my-topic-branch^0 &&
-     git-checkout -f my-topic-branch
+test_debug '
+	git cherry master &&
+	git format-patch -k --stdout --full-index master >/dev/null &&
+	gitk --all & sleep 1
 '
 
-test_debug \
-    'git-cherry master &&
-     git-format-patch -k --stdout --full-index master >/dev/null &&
-     gitk --all & sleep 1
+test_expect_success 'rebase topic branch against new master and check git am did not get halted' '
+	git rebase master &&
+	test_path_is_missing .git/rebase-apply
 '
 
-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 reset --hard C &&
+	git rebase --merge master &&
+	test_path_is_missing .git/rebase-merge
+'
 
 test_done