зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
66b209b86a
Коммит
aa2faac03a
|
@ -8,8 +8,11 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
||||
|
||||
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
|
||||
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
|
||||
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 "cherry-pick"
|
||||
|
||||
test_expect_success 'unrelated submodule/file conflict is ignored' '
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -42,8 +42,11 @@ git_pull_noff () {
|
|||
$2 git pull --no-ff
|
||||
}
|
||||
|
||||
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
|
||||
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
|
||||
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 'pull --recurse-submodule setup' '
|
||||
|
|
|
@ -6,6 +6,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/lib-merge.sh
|
||||
|
||||
#
|
||||
# history
|
||||
|
@ -328,7 +329,7 @@ test_expect_success 'setup file/submodule conflict' '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_failure 'file/submodule conflict' '
|
||||
test_expect_merge_algorithm failure success 'file/submodule conflict' '
|
||||
test_when_finished "git -C file-submodule reset --hard" &&
|
||||
(
|
||||
cd file-submodule &&
|
||||
|
@ -437,7 +438,7 @@ test_expect_failure 'directory/submodule conflict; keep submodule clean' '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_failure !FAIL_PREREQS 'directory/submodule conflict; should not treat submodule files as untracked or in the way' '
|
||||
test_expect_merge_algorithm failure success !FAIL_PREREQS 'directory/submodule conflict; should not treat submodule files as untracked or in the way' '
|
||||
test_when_finished "git -C directory-submodule/path reset --hard" &&
|
||||
test_when_finished "git -C directory-submodule reset --hard" &&
|
||||
(
|
||||
|
|
|
@ -12,8 +12,11 @@ test_submodule_switch "merge --ff"
|
|||
|
||||
test_submodule_switch "merge --ff-only"
|
||||
|
||||
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
|
||||
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
|
||||
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
|
||||
|
|
Загрузка…
Ссылка в новой задаче