From: Kjetil Barvik <barvik@broadpark.no>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Pickens, James E" <james.e.pickens@intel.com>,
Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Michael J Gruber <git@drmicha.warpmail.net>
Subject: Re: [PATCH v3] Demonstrate bugs when a directory is replaced with a symlink
Date: Thu, 30 Jul 2009 01:01:40 +0200 [thread overview]
Message-ID: <86prbjm6uj.fsf@broadpark.no> (raw)
In-Reply-To: <alpine.LFD.2.01.0907291440480.3161@localhost.localdomain>
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Wed, 29 Jul 2009, Pickens, James E wrote:
>>
>> This test creates two directories, a/b and a/b-2, then replaces a/b with
>> a symlink to a/b-2, then merges that change into the 'baseline' commit,
>> which contains an unrelated change.
>
> Great tests.
>
> This patch should fix the 'checkout' issue.
>
> I made it use a new generic helper function ("check_path()"), since there
> are other cases like this that use just 'lstat()', and I bet we want to
> change that.
>
> The 'merge' issue is different, though: it's not due to a blind 'lstat()',
> but due to a blind 'unlink()' done by 'remove_path()'. I think
> 'remove_path()' should be taught to look for symlinks, and remove just the
> symlink - but that's a bit more work, especially since the symlink cache
> doesn't seem to expose any way to get the "what is the first symlink path"
> information.
>
> Kjetil, can you look at that?
Yes, I will take a look. Also, on all the other mails CC'ed to me
today. Give me a cople of days.
Sorry, I do not work at "full normal speed" for the moment. But, I
will try to my best.
-- kjetil
next prev parent reply other threads:[~2009-07-29 23:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-28 22:13 More symlink/directory troubles James Pickens
2009-07-28 22:13 ` [PATCH 1/2] Demonstrate bugs when a directory is replaced with a symlink James Pickens
2009-07-28 22:13 ` [PATCH 2/2] Demonstrate merge failure " James Pickens
2009-07-29 8:29 ` Michael J Gruber
2009-07-29 16:39 ` Pickens, James E
2009-07-29 8:19 ` [PATCH 1/2] Demonstrate bugs " Michael J Gruber
2009-07-29 8:33 ` Junio C Hamano
2009-07-29 16:57 ` Pickens, James E
2009-07-29 17:48 ` [PATCH v2] " Pickens, James E
2009-07-29 18:31 ` Junio C Hamano
2009-07-29 21:02 ` [PATCH v3] " Pickens, James E
2009-07-29 22:08 ` Linus Torvalds
2009-07-29 22:44 ` Junio C Hamano
2009-07-29 23:01 ` Kjetil Barvik [this message]
2009-07-29 23:58 ` Linus Torvalds
2009-07-30 1:06 ` Linus Torvalds
2009-07-30 3:26 ` Junio C Hamano
2009-07-30 6:05 ` Junio C Hamano
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=86prbjm6uj.fsf@broadpark.no \
--to=barvik@broadpark.no \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=james.e.pickens@intel.com \
--cc=torvalds@linux-foundation.org \
/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.