From: Jeff King <peff@peff.net>
Date: Mon, 23 May 2011 23:41:31 GMT
Subject: Re: combined diff does not detect binary files and ignores -diff attribute
Message-ID: <20110523234131.GB10488@sigill.intra.peff.net>
In-Reply-To: <BANLkTikvPjO=bbhAoPCftdXzGSYtryNvzw@mail.gmail.com>

On Mon, May 23, 2011 at 06:55:07PM -0400, Jay Soffian wrote:

> 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. :-)

Yeah, I didn't add any support for that. I'm not sure what it should do;
custom diff drivers don't know how to handle combined diff, do they?

If you write me a test case that explains what _should_ happen, I'll see
what I can do. :)

-Peff