From: Ralf Baechle <ralf@linux-mips.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Davide Libenzi <davidel@xmailserver.org>,
Morten Welinder <mwelinder@gmail.com>,
Junio C Hamano <junkio@cox.net>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Use a *real* built-in diff generator
Date: Sun, 26 Mar 2006 12:09:35 +0100 [thread overview]
Message-ID: <20060326110934.GA3774@linux-mips.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0603251030340.15714@g5.osdl.org>
On Sat, Mar 25, 2006 at 10:39:03AM -0800, Linus Torvalds wrote:
> Besides, I hate how GNU patch bends over backwards in applying crap that
> isn't a proper patch at all (whitespace-corruption, you name it: GNU patch
> will accept it). Also, I made "git-apply" be all-or-nothing: either it
> applies the _whole_ patch (across many different files) or it applies none
> of it. With GNU patch, if you get an error on the fifth file, the four
> first files have been modified already - aarrgghhh..
Which is apply's greatest strength - and weakness. GNU diff doesn't
understand the file renamings bits of git diffs, so they they need to be
used with apply. So if a patch doesn't apply? Apply doesn't even have
an option to apply things as good as it can and leave the rest in
reject files. Yuck.
Ralf
next prev parent reply other threads:[~2006-03-26 11:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-25 4:13 Use a *real* built-in diff generator Linus Torvalds
2006-03-25 6:54 ` Junio C Hamano
2006-03-25 7:39 ` Junio C Hamano
2006-03-25 17:28 ` Linus Torvalds
2006-03-25 9:03 ` Davide Libenzi
2006-03-25 9:35 ` Marco Costalba
2006-03-25 12:56 ` Alex Riesen
2006-03-25 16:09 ` Linus Torvalds
2006-03-25 13:44 ` Morten Welinder
2006-03-25 15:36 ` Linus Torvalds
2006-03-25 15:56 ` Linus Torvalds
2006-03-25 18:14 ` Davide Libenzi
2006-03-25 18:39 ` Linus Torvalds
2006-03-26 4:11 ` Davide Libenzi
2006-03-26 11:09 ` Ralf Baechle [this message]
2006-03-26 18:20 ` Petr Baudis
2006-03-25 18:48 ` Linus Torvalds
2006-03-26 5:33 ` Davide Libenzi
2006-03-25 19:52 ` Junio C Hamano
2006-03-25 20:17 ` Junio C Hamano
2006-03-25 20:48 ` Linus Torvalds
2006-03-25 21:06 ` Linus Torvalds
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=20060326110934.GA3774@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=davidel@xmailserver.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=mwelinder@gmail.com \
--cc=torvalds@osdl.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.