---
t/t3400-rebase.sh | 31 +
t/t3401-rebase-partial.sh | 45 ---
t/t3404-rebase-interactive.sh | 10 +-
t/t3409-rebase-preserve-merges.sh | 53
t/t3425-rebase-topology-merges.sh | 250 ++
5 files changed, 252 insertions(+), 137 deletions(-)
delete mode 100755 t/t3401-rebase-partial.sh
create mode 100755 t/t3425-rebase-topology-merges.sh
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index b58fa1a..b436ef4 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -40,13 +40,6 @@ test_expect_success 'prepare repository with topic branches'
'
echo Side C
git add C
git commit -m Add C
- git checkout -b nonlinear my-topic-branch
- echo Edit B
- git add B
- git commit -m Modify B
- git merge side
- git checkout -b upstream-merged-nonlinear
- git merge master
git checkout -f my-topic-branch
git tag topic
'
@@ -106,31 +99,9 @@ test_expect_success 'rebase from ambiguous branch name' '
git rebase master
'
-test_expect_success 'rebase after merge master' '
- git checkout --detach refs/tags/topic
- git branch -D topic
- git reset --hard topic
- git merge master
- git rebase master
- ! (git show | grep ^Merge:)
-'
-
-test_expect_success 'rebase of history with merges is linearized' '
- git checkout nonlinear
- test 4 = $(git rev-list master.. | wc -l)
- git rebase master
- test 3 = $(git rev-list master.. | wc -l)
-'
-
-test_expect_success 'rebase of history with merges after upstream merge is
linearized' '
- git checkout upstream-merged-nonlinear
- test 5 = $(git rev-list master.. | wc -l)
- git rebase master
- test 3 = $(git rev-list master.. | wc -l)
-'
-
test_expect_success 'rebase a single mode change' '
git checkout master
+ git branch -D topic
echo 1 X
git add X
test_tick
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
deleted file mode 100755
index 7ba1797..000
--- a/t/t3401-rebase-partial.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
-#
-
-test_description='git rebase should detect patches integrated upstream
-
-This test cherry-picks one local change of two into master branch, and
-checks that git rebase succeeds with only the second patch in the
-local branch.
-'
-. ./test-lib.sh
-
-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
-'
-
-test_expect_success 'pick top patch from topic branch into master' '
- git cherry-pick C
- 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_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 --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
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index a58406d..ffcaf02 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -477,19 +477,11 @@ test_expect_success 'interrupted squash works as expected
(case 2)' '
test $one = $(git rev-parse HEAD~2)
'
-test_expect_success 'ignore patch if in upstream' '
- HEAD=$(git rev-parse HEAD)
- git checkout -b has-cherry-picked HEAD^
+test_expect_success '--continue tries to commit, even for edit' '
echo unrelated file7
git add file7
test_tick
git commit -m unrelated change
- git cherry-pick $HEAD
- EXPECT_COUNT=1 git rebase -i $HEAD
- test $HEAD = $(git rev-parse HEAD^)
-'
-
-test_expect_success '--continue tries to commit, even for edit' '
parent=$(git rev-parse HEAD^)
test_tick
FAKE_LINES=edit 1 git rebase -i HEAD^
diff --git a/t/t3409-rebase-preserve-merges.sh
b/t/t3409-rebase-preserve-merges.sh
index 6de4e22..2e0c364 100755
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -11,14 +11,6 @@ Run git rebase -p and check that merges are properly
carried along
GIT_AUTHOR_EMAIL=bogus_email_address
export GIT_AUTHOR_EMAIL
-# Clone 1 (trivial merge):
-#
-# A1--A2 -- origin/master
-# \ \
-# B1--M -- topic
-#\
-# B2 -- origin/topic
-#
# Clone 2 (conflicting merge):
#
# A1--A2--B3 -- origin/master
@@ -36,16 +28,6 @@ export GIT_AUTHOR_EMAIL
# \--A3
