Re: Use a *real* built-in diff generator
- From
Linus Torvalds <torvalds@osdl.org>
- Date
- Mar 25, 2006, 21:06 UTC
- Message-ID
- <Pine.LNX.4.64.0603251256330.15714@g5.osdl.org>
- In-Reply-To
- <7vslp6uvn1.fsf@assigned-by-dhcp.cox.net>
On Sat, 25 Mar 2006, Junio C Hamano wrote:
> > This is a replacement for my previous one, which reduces the > changes to the testsuite.
Btw, your comment about the GNU diff @@-line simplification made me look at that again.
git-apply used to believe that a simplified line (ie with a single value) meant "x,x". While it seems that it really means "x,1".
Now, at worst, this would probably mean that some patches would get rejected (rather than mis-applied), so I think we've just never hit it. Also, with the default 3-line context I think that it simply _cannot_ be hit (since the only way that the result or source would have only one line in the resulting is it was the first line).
But if the "x" shorthand really means "x,1" (and I think you're right - using "-U 1" I can get that kind of shorthand) then apply.c should be fixed as follows (actual patch: removal of two characters).
Signed-off-by: Linus Torvalds <torvalds@osdl.org> ---
diff --git a/apply.c b/apply.c index 2da225a..e80cd15 100644 --- a/apply.c +++ b/apply.c @@ -693,7 +693,7 @@ static int parse_range(const char *line, line += digits; len -= digits; - *p2 = *p1; + *p2 = 1; if (*line == ',') { digits = parse_num(line+1, p2); if (!digits)