rebase: remove a couple of redundant strategy tests

Remove a test in t3402 that has been redundant ever since 80ff47957b
(rebase: remember strategy and strategy options, 2011-02-06).  That
commit added a new test, the first part of which (as noted in the old
commit message) duplicated an existing test.

Also remove a test t3418 that has been redundant since the merge backend
was removed in 68aa495b59 (rebase: implement --merge via the interactive
machinery, 2018-12-11), since it now tests the same code paths as the
preceding test.

Helped-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index 7e46f4ca850616b695cc6ffa061ca39ac404fb7d..79b0640c004e23f5346d9bfe1ba9998791633887 100755 (executable)
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -131,27 +131,6 @@ test_expect_success 'picking rebase' '
        esac
 '
 
-test_expect_success 'rebase -s funny -Xopt' '
-       test_when_finished "rm -fr test-bin funny.was.run" &&
-       mkdir test-bin &&
-       cat >test-bin/git-merge-funny <<-EOF &&
-       #!$SHELL_PATH
-       case "\$1" in --opt) ;; *) exit 2 ;; esac
-       shift &&
-       >funny.was.run &&
-       exec git merge-recursive "\$@"
-       EOF
-       chmod +x test-bin/git-merge-funny &&
-       git reset --hard &&
-       git checkout -b test-funny main^ &&
-       test_commit funny &&
-       (
-               PATH=./test-bin:$PATH &&
-               git rebase -s funny -Xopt main
-       ) &&
-       test -f funny.was.run
-'
-
 test_expect_success 'rebase --skip works with two conflicts in a row' '
        git checkout second-side  &&
        tr "[A-Z]" "[a-z]" <newfile >tmp &&

diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index 42c3954125d4bb30e779fe186a5fcb2329040871..2d0789e554bf00a604a347ab0e9c7b3781e4a96a 100755 (executable)
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -97,38 +97,6 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
        test_cmp expect actual
 '
 
-test_expect_success 'rebase -i --continue handles merge strategy and options' '
-       rm -fr .git/rebase-* &&
-       git reset --hard commit-new-file-F2-on-topic-branch &&
-       test_commit "commit-new-file-F3-on-topic-branch-for-dash-i" F3 32 &&
-       test_when_finished "rm -fr test-bin funny.was.run funny.args" &&
-       mkdir test-bin &&
-       cat >test-bin/git-merge-funny <<-EOF &&
-       #!$SHELL_PATH
-       echo "\$@" >>funny.args
-       case "\$1" in --opt) ;; *) exit 2 ;; esac
-       case "\$2" in --foo) ;; *) exit 2 ;; esac
-       case "\$4" in --) ;; *) exit 2 ;; esac
-       shift 2 &&
-       >funny.was.run &&
-       exec git merge-recursive "\$@"
-       EOF
-       chmod +x test-bin/git-merge-funny &&
-       (
-               PATH=./test-bin:$PATH &&
-               test_must_fail git rebase -i -s funny -Xopt -Xfoo main topic
-       ) &&
-       test -f funny.was.run &&
-       rm funny.was.run &&
-       echo "Resolved" >F2 &&
-       git add F2 &&
-       (
-               PATH=./test-bin:$PATH &&
-               git rebase --continue
-       ) &&
-       test -f funny.was.run
-'
-
 test_expect_success 'rebase -r passes merge strategy options correctly' '
        rm -fr .git/rebase-* &&
        git reset --hard commit-new-file-F3-on-topic-branch &&