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 --- t/t5572-pull-submodule.sh | 5 ----- 1 file changed, 5 deletions(-) (limited to 't/t5572-pull-submodule.sh') diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh index f7650e8475..45f384dd32 100755 --- a/t/t5572-pull-submodule.sh +++ b/t/t5572-pull-submodule.sh @@ -45,11 +45,6 @@ git_pull_noff () { $2 git pull --no-ff } -if test "$GIT_TEST_MERGE_ALGORITHM" != ort -then - KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 - KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 -fi test_submodule_switch_func "git_pull_noff" test_expect_success 'setup' ' -- cgit v1.3-5-g9baa