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 /t/t6438-submodule-directory-file-conflicts.sh | |
| parent | merge-recursive.[ch]: thoroughly debug these (diff) | |
| download | git-bfbd201e39b86028440fc95c47173d8da38e1cd2.tar.gz git-bfbd201e39b86028440fc95c47173d8da38e1cd2.zip | |
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 't/t6438-submodule-directory-file-conflicts.sh')
| -rwxr-xr-x | t/t6438-submodule-directory-file-conflicts.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/t/t6438-submodule-directory-file-conflicts.sh b/t/t6438-submodule-directory-file-conflicts.sh index 8df67a0ef9..53d83c828a 100755 --- a/t/t6438-submodule-directory-file-conflicts.sh +++ b/t/t6438-submodule-directory-file-conflicts.sh @@ -12,11 +12,6 @@ test_submodule_switch "merge --ff" test_submodule_switch "merge --ff-only" -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 "merge --no-ff" test_done |