mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![Elijah Newren](/assets/img/avatar_default.png)
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>
23 lines
487 B
Bash
Executable file
23 lines
487 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='merge can handle submodules'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
|
|
|
# merges without conflicts
|
|
test_submodule_switch "merge"
|
|
|
|
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
|