From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Jul 2009 22:44:57 GMT
Subject: Re: [PATCH v3] Demonstrate bugs when a directory is replaced with a symlink
Message-ID: <7vprbjp0ra.fsf@alter.siamese.dyndns.org>
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.

Thanks.

I've queued v2 with local fixes and Kjetil's earlier fix in 'pu' that
updates has_symlink_leading_path() breakage.  Will take a look at your
patch (and v3 test) later.