From bfbd201e39b86028440fc95c47173d8da38e1cd2 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 8 Apr 2025 15:48:41 +0000 Subject: tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm Both of these existed to allow us to reuse all the merge-related tests in the testsuite while easily flipping between the 'recursive' and the 'ort' backends. Now that we have removed merge-recursive and remapped 'recursive' to mean 'ort', we don't need this scaffolding anymore. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- ci/run-build-and-tests.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'ci') diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index 1c69846723..f99b7db2ee 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -20,7 +20,6 @@ linux-breaking-changes) linux-TEST-vars) export OPENSSL_SHA1_UNSAFE=YesPlease export GIT_TEST_SPLIT_INDEX=yes - export GIT_TEST_MERGE_ALGORITHM=recursive export GIT_TEST_FULL_IN_PACK_ARRAY=true export GIT_TEST_OE_SIZE=10 export GIT_TEST_OE_DELTA_SIZE=5 -- cgit v1.2.3