diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:13 -0700 |
| commit | bfbd201e39b86028440fc95c47173d8da38e1cd2 (patch) | |
| tree | c656921e7bcc70882ee322122c6f738ce6e6e0f2 /ci | |
| parent | ad45b327c0a13718ed5955319d1e735025676cc8 (diff) | |
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run-build-and-tests.sh | 1 |
1 files changed, 0 insertions, 1 deletions
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 |