From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, newren@gmail.com
Subject: Re: [RFC PATCH] merge-recursive: symlink's descendants not in way
Date: Tue, 17 Sep 2019 15:37:43 -0700 [thread overview]
Message-ID: <xmqq8sqm7dmw.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190917223236.149613-1-jonathantanmy@google.com> (Jonathan Tan's message of "Tue, 17 Sep 2019 15:32:36 -0700")
Jonathan Tan <jonathantanmy@google.com> writes:
>> In any case, if the working tree has 'foo' as a symlink, Git should
>> not look at or get affected by what 'foo' points at.
>
> Git should not, but it does - there is a call in process_entry() that calls
> lstat() on "foo/bar", which indeed reports that "foo/bar" is a directory. This
> patch adds a check that none of its ancestors are symlinks.
Yeah, I recall having to add has_symlink_leading_path() long time
ago in different codepaths (including "apply"). It is not surprising
to see a similar glitch remaining in merge-recursive (it's a tricky
issue, and it's a tricky code).
next prev parent reply other threads:[~2019-09-17 22:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 21:47 merge-recursive thinks symlink's child dirs are "real" Jonathan Tan
2019-09-16 22:15 ` SZEDER Gábor
2019-09-17 15:54 ` Elijah Newren
2019-09-17 0:09 ` Jonathan Nieder
2019-09-17 16:02 ` Elijah Newren
2019-09-17 15:48 ` Elijah Newren
2019-09-17 21:50 ` [RFC PATCH] merge-recursive: symlink's descendants not in way Jonathan Tan
2019-09-17 22:23 ` Junio C Hamano
2019-09-17 22:32 ` Jonathan Tan
2019-09-17 22:37 ` Junio C Hamano [this message]
2019-09-17 22:49 ` Jonathan Tan
2019-09-17 23:02 ` SZEDER Gábor
2019-09-18 0:35 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8sqm7dmw.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.