]> git.ipfire.org Git - thirdparty/git.git/commit
rebase: remove a couple of redundant strategy tests
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Mon, 10 Apr 2023 09:08:31 +0000 (10:08 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Apr 2023 16:53:19 +0000 (09:53 -0700)
commit05106aa198cd0f8a5643556ac9f8a1dfdbdb5bdd
tree881dc18c06a2663ec257eae06cb63ab76b4130b7
parent4960e5c7bdd399e791353bc6c551f09298746f61
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>
t/t3402-rebase-merge.sh
t/t3418-rebase-continue.sh