All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
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>,
	Kjetil Barvik <barvik@broadpark.no>,
	Michael J Gruber <git@drmicha.warpmail.net>
Subject: Re: [PATCH v3] Demonstrate bugs when a directory is replaced with a symlink
Date: Wed, 29 Jul 2009 15:44:57 -0700	[thread overview]
Message-ID: <7vprbjp0ra.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.2.01.0907291440480.3161@localhost.localdomain> (Linus Torvalds's message of "Wed\, 29 Jul 2009 15\:08\:12 -0700 \(PDT\)")

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.

  reply	other threads:[~2009-07-29 22:45 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 [this message]
2009-07-29 23:01               ` Kjetil Barvik
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=7vprbjp0ra.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=barvik@broadpark.no \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --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.