* [PATCH] merge-recursive: Handle addition of submodule on our side of history
[not found] <ABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@mail.gmail.com>
@ 2017-11-14 17:31 ` Elijah Newren
2017-11-14 18:48 ` Stefan Beller
0 siblings, 1 reply; 3+ messages in thread
From: Elijah Newren @ 2017-11-14 17:31 UTC (permalink / raw)
To: git; +Cc: sbeller, Elijah Newren
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>
---
This commit is based on top of sb/test-cherry-pick-submodule-getting-in-a-way.
merge-recursive.c | 5 +++--
t/t3512-cherry-pick-submodule.sh | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 1d3f8f0d22..9fb0b9f8fd 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1901,8 +1901,9 @@ static int process_entry(struct merge_options *o,
oid = b_oid;
conf = _("directory/file");
}
- if (dir_in_way(path, !o->call_depth,
- S_ISGITLINK(a_mode))) {
+ if (dir_in_way(path,
+ !o->call_depth && !S_ISGITLINK(a_mode),
+ 0)) {
char *new_path = unique_path(o, path, add_branch);
clean_merge = 0;
output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
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 &&
--
2.15.0.2.g63e86ab1a0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] merge-recursive: Handle addition of submodule on our side of history
2017-11-14 17:31 ` [PATCH] merge-recursive: Handle addition of submodule on our side of history Elijah Newren
@ 2017-11-14 18:48 ` Stefan Beller
2017-11-14 20:51 ` Stefan Beller
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Beller @ 2017-11-14 18:48 UTC (permalink / raw)
To: Elijah Newren; +Cc: git, real
+cc Ефимов Василий <real@ispras.ru> who reported the issue at
https://public-inbox.org/git/743acc29-85bb-3773-b6a0-68d4a0b8fd63@ispras.ru/
On Tue, Nov 14, 2017 at 9:31 AM, Elijah Newren <newren@gmail.com> wrote:
> 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>
> ---
> This commit is based on top of sb/test-cherry-pick-submodule-getting-in-a-way.
Thanks for getting the discussion started here (and fixing the bug),
based on your input in
https://public-inbox.org/git/CABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@mail.gmail.com/
I adapted the test case locally to have two tests one file/submodule
and a submodule/file conflict, after the setup which boroows a lot of
code from the
existing test, we'll have:
test_expect_success 'unrelated submodule/file conflict is ignored' '
(
cd a_repo &&
git checkout with_sub^0 &&
git cherry-pick with_file^0
)
'
test_expect_success 'unrelated file/submodule conflict is ignored' '
(
cd a_repo &&
git checkout with_file^0 &&
git cherry-pick with_sub^0
)
'
and the other case now fails. I'll take a look into that. I think we'd need to
check either a_mode or b_mode to be a submodule depending on which side
the submodule occured.
So I'll build on top of this patch to fix the other way, too.
>
> merge-recursive.c | 5 +++--
> t/t3512-cherry-pick-submodule.sh | 2 +-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 1d3f8f0d22..9fb0b9f8fd 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -1901,8 +1901,9 @@ static int process_entry(struct merge_options *o,
> oid = b_oid;
> conf = _("directory/file");
> }
> - if (dir_in_way(path, !o->call_depth,
> - S_ISGITLINK(a_mode))) {
> + if (dir_in_way(path,
> + !o->call_depth && !S_ISGITLINK(a_mode),
> + 0)) {
The last flag is_empty_ok is ok to keep at 0, I think.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] merge-recursive: Handle addition of submodule on our side of history
2017-11-14 18:48 ` Stefan Beller
@ 2017-11-14 20:51 ` Stefan Beller
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Beller @ 2017-11-14 20:51 UTC (permalink / raw)
To: Elijah Newren; +Cc: git, real
On Tue, Nov 14, 2017 at 10:48 AM, Stefan Beller <sbeller@google.com> wrote:
> test_expect_success 'unrelated file/submodule conflict is ignored' '
> (
> cd a_repo &&
> git checkout with_file^0 &&
> git cherry-pick with_sub^0
This makes no sense, yet. Sorry about the noise.
I think your patch is fine as is.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-14 20:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <ABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@mail.gmail.com>
2017-11-14 17:31 ` [PATCH] merge-recursive: Handle addition of submodule on our side of history Elijah Newren
2017-11-14 18:48 ` Stefan Beller
2017-11-14 20:51 ` Stefan Beller
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).