From: Linus Torvalds <torvalds@osdl.org>
Date: Sat, 25 Mar 2006 17:28:47 GMT
Subject: Re: Use a *real* built-in diff generator
Message-ID: <Pine.LNX.4.64.0603250927410.15714@g5.osdl.org>
In-Reply-To: <7vk6ajxbe5.fsf@assigned-by-dhcp.cox.net>



On Fri, 24 Mar 2006, Junio C Hamano wrote:
> 
> Another thing I noticed is that while libxdiff always shows full
> line counts "-n,m +l,k" GNU seems to omit them when it can (m,k
> <=1).  I am not sure if apply.c is set up to grok what libxdiff
> emits correctly.  Running t/t1200 shows some obvious examples.

Actually, the GNU diff output is the special case, and git-apply handles 
it as such. 

We could make libxdiff do the same @@-shortening, but it doesn't seem to 
be huge deal.

		Linus