Re: "make test" fails with current HEAD

From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Nov 18, 2005, 08:56 UTC
Message-ID: <pan.2005.11.18.08.56.22.908009@smurf.noris.de>
In-Reply-To: <7vbr0imlha.fsf@assigned-by-dhcp.cox.net>

Hi, Junio C Hamano wrote:

Show 9 quoted lines

> Matthias Urlichs <smurf@smurf.noris.de> writes:
> 
>>>> Files /dev/null and b/file3 differ
>>
>> Of course, with LANG=de_DE.UTF-8 the situation is worse ...
> 
> A midway compromise solution would be to detect if either file
> is binary ourselves and not to call diff but always say "Binary
> files difer".

Actually, there's a better way:

$ diff -u /dev/null /tmp/ra Binary files /dev/null and /tmp/ra differ $ echo $? 2

So the trivial fix is to emit our own "Binary files FOO and BAR differ" line if the exit status is 2.

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
If a man will go as far as he can see, he will be able to see farther when
he gets there.