From: A Large Angry SCM <gitzilla@gmail.com>
Date: Fri, 18 Nov 2005 04:58:26 GMT
Subject: Re: [PATCH] Deal with binary diff output from (unknown version of) diff
Message-ID: <437D5F72.8050100@gmail.com>
In-Reply-To: <7v1x1er2ai.fsf_-_@assigned-by-dhcp.cox.net>

Passed here!


Junio C Hamano wrote:
> Some vintage of diff says just "Files X and Y differ\n", instead
> of "Binary files X and Y differ\n", so catch both patterns.
> 
> Signed-off-by: Junio C Hamano <junkio@cox.net>
> 
> ---
> 
>     Junio C Hamano <junkio@cox.net> writes:
> 
>     >> Files /dev/null and b/file3 differ
>     >> diff --git a/file4 b/file4
>     >> index edc575d..adb07b7 100644
>     >> Files a/file4 and b/file4 differ
>     >
>     > Thanks.  I've seen enough.  I expected diff (GNU diffutils 2.8.1
>     > is what I have handy) output which says "Binary files a/foo and
>     > b/foo differ".
>     >
>     > Hmph.  Now I'd need to find a way to catch at least these two
>     > cases...
> 
>     Could you two try this patch please?

[snip snip]