From: Linus Torvalds <torvalds@linux-foundation.org>
To: David Kastrup <dak@gnu.org>
Cc: Junio C Hamano <gitster@pobox.com>,
david@lang.hm, git@vger.kernel.org, rob@landley.net
Subject: Re: possible bug in git apply?
Date: Sun, 5 Aug 2007 12:20:48 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.0.999.0708051219440.5037@woody.linux-foundation.org> (raw)
In-Reply-To: <853ayxiznp.fsf@lola.goethe.zz>
On Sun, 5 Aug 2007, David Kastrup wrote:
>
> But your proposed three passes won't work with a patch removing
> "x/..." and creating "x" in its place, since "x/" gets only removed
> in pass 3, and "x" needs to created in pass 2 already.
Yes, I was wrong. The current two passes are the right thing to do, and we
should just always remove empty directories (and my patch was fine: we can
leave them alone if it's a pure "modify file in place", but that's really
the only case).
Linus
next prev parent reply other threads:[~2007-08-05 19:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-04 19:45 possible bug in git apply? david
2007-08-04 20:00 ` Junio C Hamano
2007-08-04 20:08 ` David Kastrup
2007-08-05 4:48 ` Linus Torvalds
2007-08-05 4:53 ` Linus Torvalds
2007-08-05 5:11 ` Junio C Hamano
2007-08-05 7:55 ` David Kastrup
2007-08-05 16:59 ` Linus Torvalds
2007-08-05 17:53 ` David Kastrup
2007-08-05 18:18 ` Linus Torvalds
2007-08-05 18:50 ` David Kastrup
2007-08-05 19:20 ` Linus Torvalds [this message]
2007-08-05 19:37 ` David Kastrup
2007-08-06 8:29 ` Junio C Hamano
2007-08-06 9:37 ` 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=alpine.LFD.0.999.0708051219440.5037@woody.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=dak@gnu.org \
--cc=david@lang.hm \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rob@landley.net \
/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 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 NNTP newsgroup(s).