diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-07 21:05:04 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-07 21:45:32 -0700 |
| commit | aa4df107e72a7a8bd2f149ecb58edfe9dde8576b (patch) | |
| tree | afc1aeab67b48481f50404246bcc048b6913e829 /t/test-lib.sh | |
| parent | ab7c7c219b487ad8cde94c8c1155977cb2efd52b (diff) | |
| download | git-aa4df107e72a7a8bd2f149ecb58edfe9dde8576b.tar.gz | |
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>
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index abcfbed6d6..11a9c8a651 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1708,10 +1708,6 @@ test_lazy_prereq SHA1 ' esac ' -test_lazy_prereq REBASE_P ' - test -z "$GIT_TEST_SKIP_REBASE_P" -' - # Ensure that no test accidentally triggers a Git command # that runs the actual maintenance scheduler, affecting a user's # system permanently. |