From: Linus Torvalds <torvalds@linux-foundation.org>
To: Francis Moreau <francis.moro@gmail.com>
Cc: "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: Thu, 14 Aug 2008 13:02:40 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.1.10.0808141258180.3324@nehalem.linux-foundation.org> (raw)
In-Reply-To: <alpine.LFD.1.10.0808141246190.3324@nehalem.linux-foundation.org>
On Thu, 14 Aug 2008, Linus Torvalds wrote:
>
> There's no way to do an all-or-nothing patch, which is often
> a huge requirement.
Side note: there's a way to do a "nothing or nothing" thing, and then test
the return value of whether the do-nothing was successful or not.
So a reasonably common operation thing for scripting GNU patch is to
literally do
patch --dry-run
first to see if the patch will succeed.
..or to play games with backup and reject files after-the-fact, of course.
Linus
next prev parent reply other threads:[~2008-08-14 20:04 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 [this message]
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
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=alpine.LFD.1.10.0808141258180.3324@nehalem.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=francis.moro@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
/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).