diff options
| author | Elijah Newren <newren@gmail.com> | 2021-03-20 00:03:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-20 19:35:40 (GMT) |
| commit | aa2faac03ad646873ebac2b230581d1d26dd1b99 (patch) | |
| tree | e38b8effb1600ec1123ff56a3331b890367c46a0 /t/t3513-revert-submodule.sh | |
| parent | 66b209b86ad3b79728d3f0f22e1bdef6b17a12c1 (diff) | |
| download | git-aa2faac03ad646873ebac2b230581d1d26dd1b99.zip git-aa2faac03ad646873ebac2b230581d1d26dd1b99.tar.gz git-aa2faac03ad646873ebac2b230581d1d26dd1b99.tar.bz2 | |
t: mark several submodule merging tests as fixed under merge-ort
merge-ort handles submodules (and directory/file conflicts in general)
differently than merge-recursive does; it basically puts all the special
handling for different filetypes into one place in the codebase instead
of needing special handling for different filetypes in many different
code paths. This one code path in merge-ort could perhaps use some work
still (there are still test_expect_failure cases in the testsuite), but
it passes all the tests that merge-recursive does as well as 12
additional ones that merge-recursive fails. Mark those 12 tests as
test_expect_success under merge-ort.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3513-revert-submodule.sh')
| -rwxr-xr-x | t/t3513-revert-submodule.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t3513-revert-submodule.sh b/t/t3513-revert-submodule.sh index a759f12..74cd96e 100755 --- a/t/t3513-revert-submodule.sh +++ b/t/t3513-revert-submodule.sh @@ -30,7 +30,10 @@ git_revert () { git revert HEAD } -KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 +if test "$GIT_TEST_MERGE_ALGORITHM" != ort +then + KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 +fi test_submodule_switch_func "git_revert" test_done |