Merge branch 'js/retire-preserve-merges'

[thirdparty/git.git] / t / t3404-rebase-interactive.sh

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 972ce026bbcc55bb2a0b04abe89d0b2e35120f5c..12eb226957676e7a1de02c0c22f629c3dc78ba74 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -352,82 +352,6 @@ test_expect_success 'retain authorship when squashing' '
        git show HEAD | grep "^Author: Twerp Snog"
 '
 
-test_expect_success REBASE_P '-p handles "no changes" gracefully' '
-       HEAD=$(git rev-parse HEAD) &&
-       git rebase -i -p HEAD^ &&
-       git update-index --refresh &&
-       git diff-files --quiet &&
-       git diff-index --quiet --cached HEAD -- &&
-       test $HEAD = $(git rev-parse HEAD)
-'
-
-test_expect_failure REBASE_P 'exchange two commits with -p' '
-       git checkout H &&
-       (
-               set_fake_editor &&
-               FAKE_LINES="2 1" git rebase -i -p HEAD~2
-       ) &&
-       test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-       test G = $(git cat-file commit HEAD | sed -ne \$p)
-'
-
-test_expect_success REBASE_P 'preserve merges with -p' '
-       git checkout -b to-be-preserved primary^ &&
-       : > unrelated-file &&
-       git add unrelated-file &&
-       test_tick &&
-       git commit -m "unrelated" &&
-       git checkout -b another-branch primary &&
-       echo B > file1 &&
-       test_tick &&
-       git commit -m J file1 &&
-       test_tick &&
-       git merge to-be-preserved &&
-       echo C > file1 &&
-       test_tick &&
-       git commit -m K file1 &&
-       echo D > file1 &&
-       test_tick &&
-       git commit -m L1 file1 &&
-       git checkout HEAD^ &&
-       echo 1 > unrelated-file &&
-       test_tick &&
-       git commit -m L2 unrelated-file &&
-       test_tick &&
-       git merge another-branch &&
-       echo E > file1 &&
-       test_tick &&
-       git commit -m M file1 &&
-       git checkout -b to-be-rebased &&
-       test_tick &&
-       git rebase -i -p --onto branch1 primary &&
-       git update-index --refresh &&
-       git diff-files --quiet &&
-       git diff-index --quiet --cached HEAD -- &&
-       test_cmp_rev HEAD~6 branch1 &&
-       test_cmp_rev HEAD~4^2 to-be-preserved &&
-       test_cmp_rev HEAD^^2^ HEAD^^^ &&
-       test $(git show HEAD~5:file1) = B &&
-       test $(git show HEAD~3:file1) = C &&
-       test $(git show HEAD:file1) = E &&
-       test $(git show HEAD:unrelated-file) = 1
-'
-
-test_expect_success REBASE_P 'edit ancestor with -p' '
-       (
-               set_fake_editor &&
-               FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3
-       ) &&
-       echo 2 > unrelated-file &&
-       test_tick &&
-       git commit -m L2-modified --amend unrelated-file &&
-       git rebase --continue &&
-       git update-index --refresh &&
-       git diff-files --quiet &&
-       git diff-index --quiet --cached HEAD -- &&
-       test $(git show HEAD:unrelated-file) = 2
-'
-
 test_expect_success '--continue tries to commit' '
        git reset --hard D &&
        test_tick &&