diff options
author | Elijah Newren <newren@gmail.com> | 2017-11-14 09:31:24 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:42:34 +0900 |
commit | c641ca67072946f95f87e7b21f13f3d4e73701e3 (patch) | |
tree | f8005b79d1dd6cb8e7359a08ae83bfca83c8654c /t/t7606-merge-custom.sh | |
parent | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure (diff) | |
download | tgif-c641ca67072946f95f87e7b21f13f3d4e73701e3.tar.xz |
merge-recursive: handle addition of submodule on our side of history
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/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions