From: Jeff King <peff@peff.net>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>,
"Francis Moreau" <francis.moro@gmail.com>,
"René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
"Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: Why doesn't git-apply remove empty file
Date: Fri, 15 Aug 2008 00:08:34 -0400 [thread overview]
Message-ID: <20080815040834.GA3732@sigill.intra.peff.net> (raw)
In-Reply-To: <20080814211034.GE7138@leksak.fem-net>
On Thu, Aug 14, 2008 at 11:10:34PM +0200, Stephan Beyer wrote:
> git am -3 looks for the base blob in the "index" line of the patch.
>
> Now imagine you do not have this blob in git, e.g. because you've not
> fetched some large side branch from another repo.
Ah, you're right. That is much trickier (though it can still be used in
some cases, depending on how broken the patch is).
> Then git am -3 won't help, too. (Yes, in this example fetching the
> branch may help, but there may be other examples.)
An easy example that breaks: the patch submitter didn't use git at all,
so there is no branch to fetch from. :)
-Peff
next prev parent reply other threads:[~2008-08-15 4:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 16:17 Why doesn't git-apply remove empty file Francis Moreau
2008-08-13 0:25 ` Junio C Hamano
2008-08-13 7:48 ` Francis Moreau
2008-08-13 21:52 ` René Scharfe
2008-08-13 23:09 ` Linus Torvalds
2008-08-14 19:42 ` Francis Moreau
2008-08-14 19:57 ` Linus Torvalds
2008-08-14 20:02 ` Linus Torvalds
2008-08-14 20:21 ` Stephan Beyer
2008-08-14 20:54 ` Jeff King
2008-08-14 21:10 ` Stephan Beyer
2008-08-15 4:08 ` Jeff King [this message]
2008-08-15 15:53 ` Linus Torvalds
2008-08-14 20:17 ` Francis Moreau
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=20080815040834.GA3732@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=francis.moro@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
--cc=s-beyer@gmx.net \
--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 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).