From: Jay Soffian <jaysoffian@gmail.com>
Date: Mon, 23 May 2011 22:55:07 GMT
Subject: Re: combined diff does not detect binary files and ignores -diff attribute
Message-ID: <BANLkTikvPjO=bbhAoPCftdXzGSYtryNvzw@mail.gmail.com>
In-Reply-To: <20110523201529.GA6281@sigill.intra.peff.net>

On Mon, May 23, 2011 at 4:15 PM, Jeff King <peff@peff.net> wrote:
> It turned out not too bad:
>
>  [1/5]: combine-diff: split header printing into its own function
>  [2/5]: combine-diff: calculate mode_differs earlier
>  [3/5]: combine-diff: handle binary files as binary

Tested-by: Jay Soffian <jaysoffian@gmail.com>

In a real-world merge, png's were correctly shown as "Binary files
differ". I also tested with "*.xib -diff" and that worked as expected.

However, custom diff drivers (still) don't work. :-)

Also read the patches and they LGTM.

>  [4/5]: refactor get_textconv to not require diff_filespec
>  [5/5]: combine-diff: respect textconv attributes

Didn't test explicitly, but don't see anything obviously wrong.

Thanks Peff,

j.