mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: handle addition of submodule on our side of history

Browse Source 
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>
This commit is contained in:
Elijah Newren 2017-11-14 09:31:24 -08:00 committed by Junio C Hamano
parent 89c4ee4e74
commit c641ca6707
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
merge-recursive.c
View File

@ -1901,8 +1901,9 @@ static int process_entry(struct merge_options *o,
oid = b_oid; oid = b_oid;
conf = _("directory/file"); conf = _("directory/file");
} }
if (dir_in_way(path, !o->call_depth, if (dir_in_way(path,
S_ISGITLINK(a_mode))) { !o->call_depth && !S_ISGITLINK(a_mode),
0)) {
char *new_path = unique_path(o, path, add_branch); char *new_path = unique_path(o, path, add_branch);
clean_merge = 0; clean_merge = 0;
output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. " output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "

2
t/t3512-cherry-pick-submodule.sh
View File

@ -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 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
test_submodule_switch "git cherry-pick" 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 && test_create_repo sub &&
touch sub/file && touch sub/file &&