global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +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

3
t/t6430-merge-recursive.sh
View File

@@ -6,7 +6,6 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-merge.sh
test_expect_success 'setup 1' '
@@ -645,7 +644,7 @@ test_expect_success 'merge-recursive copy vs. rename' '
test_cmp expected actual
'
test_expect_merge_algorithm failure success 'merge-recursive rename vs. rename/symlink' '
test_expect_success 'merge-recursive rename vs. rename/symlink' '
git checkout -f rename &&
git merge rename-ln &&