From aa4df107e72a7a8bd2f149ecb58edfe9dde8576b Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 7 Sep 2021 21:05:04 +0000
Subject: tests: stop testing `git rebase --preserve-merges`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 t/test-lib.sh | 4 ----
 1 file changed, 4 deletions(-)

(limited to 't/test-lib.sh')

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.
-- 
cgit v1.3-5-g9baa