]> git.ipfire.org Git - thirdparty/git.git/commit
tests: stop testing `git rebase --preserve-merges`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 7 Sep 2021 21:05:04 +0000 (21:05 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2021 04:45:32 +0000 (21:45 -0700)
commitaa4df107e72a7a8bd2f149ecb58edfe9dde8576b
treeafc1aeab67b48481f50404246bcc048b6913e829
parentab7c7c219b487ad8cde94c8c1155977cb2efd52b
tests: stop testing `git rebase --preserve-merges`

This backend has been deprecated in favor of `git rebase
--rebase-merges`.

In preparation for dropping it, let's remove all the regression tests
that would need it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 files changed:
.github/workflows/main.yml
t/t3404-rebase-interactive.sh
t/t3408-rebase-multi-line.sh
t/t3409-rebase-preserve-merges.sh [deleted file]
t/t3410-rebase-preserve-dropped-merges.sh [deleted file]
t/t3411-rebase-preserve-around-merges.sh [deleted file]
t/t3412-rebase-root.sh
t/t3414-rebase-preserve-onto.sh [deleted file]
t/t3418-rebase-continue.sh
t/t3421-rebase-topology-linear.sh
t/t3422-rebase-incompatible-options.sh
t/t3425-rebase-topology-merges.sh
t/t3427-rebase-subtree.sh
t/t5520-pull.sh
t/t7505-prepare-commit-msg-hook.sh
t/t7517-per-repo-email.sh
t/test-lib.sh