global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm

Browse Source 
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>
This commit is contained in:
Elijah Newren
2025-04-08 15:48:41 +00:00
committed by Junio C Hamano
parent ad45b327c0
commit bfbd201e39
29 changed files with 236 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci/run-build-and-tests.sh
View File

@@ -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