From: Adrian Bunk <bunk@stusta.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: git-apply{,mbox,patch} should default to --unidiff-zero
Date: Fri, 6 Jul 2007 14:14:41 +0200 [thread overview]
Message-ID: <20070706121441.GM3492@stusta.de> (raw)
In-Reply-To: <7vd4z6gkbk.fsf@assigned-by-dhcp.cox.net>
On Thu, Jul 05, 2007 at 10:41:51PM -0700, Junio C Hamano wrote:
> Linus Torvalds <torvalds@linux-foundation.org> writes:
>...
> > Adrian has a point in that if there are lines to be deleted, that in
> > itself is context, and then the strict behaviour of "git-apply" is
> > arguably unnecessaily strict.
>
> Not really. That is true, unless you have two identical
> instances of the group of lines being deleted, in which case you
> cannot safely tell which instance is to be removed.
>...
The interesting thing is that you can never safely tell it for any
amount of context - I've seen patches with three lines of context being
applied at the wrong place simply because there were several matching
contexts.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
next prev parent reply other threads:[~2007-07-06 12:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-05 23:22 git-apply{,mbox,patch} should default to --unidiff-zero Adrian Bunk
2007-07-06 1:18 ` Johannes Schindelin
2007-07-06 1:42 ` Adrian Bunk
2007-07-06 1:51 ` Johannes Schindelin
2007-07-06 2:26 ` Adrian Bunk
2007-07-06 3:16 ` Johannes Schindelin
2007-07-06 4:12 ` Linus Torvalds
2007-07-06 5:41 ` Junio C Hamano
2007-07-06 12:14 ` Adrian Bunk [this message]
2007-07-06 12:49 ` Johannes Schindelin
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=20070706121441.GM3492@stusta.de \
--to=bunk@stusta.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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).