summaryrefslogtreecommitdiff
path: root/t/t3512-cherry-pick-submodule.sh
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2017-11-14 09:31:24 -0800
committerJunio C Hamano <gitster@pobox.com>2017-11-15 12:42:34 +0900
commitc641ca67072946f95f87e7b21f13f3d4e73701e3 (patch)
treef8005b79d1dd6cb8e7359a08ae83bfca83c8654c /t/t3512-cherry-pick-submodule.sh
parent89c4ee4e74269635e69c84800ece0f8b754636f6 (diff)
downloadgit-c641ca67072946f95f87e7b21f13f3d4e73701e3.tar.gz
merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-way
The code for a newly added path assumed that the path was a normal file, and thus checked for there being a directory still being in the way of the file. Note that since unpack_trees() does path-in-the-way checks already, the only way for there to be a directory in the way at this point in the code, is if there is some kind of D/F conflict in the merge. For a submodule addition on HEAD's side of history, the submodule would have already been present. This means that we do expect there to be a directory present but should not consider it to be "in the way"; instead, it's the expected submodule. So, when there's a submodule addition from HEAD's side, don't bother checking the working copy for a directory in the way. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3512-cherry-pick-submodule.sh')
-rwxr-xr-xt/t3512-cherry-pick-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh
index 1b1e31100f..ce48c4fcca 100755
--- a/t/t3512-cherry-pick-submodule.sh
+++ b/t/t3512-cherry-pick-submodule.sh
@@ -10,7 +10,7 @@ KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
test_submodule_switch "git cherry-pick"
-test_expect_failure 'unrelated submodule/file conflict is ignored' '
+test_expect_success 'unrelated submodule/file conflict is ignored' '
test_create_repo sub &&
touch sub/file &&