diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2023-04-10 09:08:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-10 16:53:19 (GMT) |
| commit | 05106aa198cd0f8a5643556ac9f8a1dfdbdb5bdd (patch) | |
| tree | 881dc18c06a2663ec257eae06cb63ab76b4130b7 /t/t3402-rebase-merge.sh | |
| parent | 4960e5c7bdd399e791353bc6c551f09298746f61 (diff) | |
| download | git-05106aa198cd0f8a5643556ac9f8a1dfdbdb5bdd.zip git-05106aa198cd0f8a5643556ac9f8a1dfdbdb5bdd.tar.gz git-05106aa198cd0f8a5643556ac9f8a1dfdbdb5bdd.tar.bz2 | |
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>
Diffstat (limited to 't/t3402-rebase-merge.sh')
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 7e46f4c..79b0640 100755 --- 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 && |