From: Jay Soffian Date: Tue, 24 May 2011 14:40:34 GMT Subject: Re: combined diff does not detect binary files and ignores -diff attribute Message-ID: In-Reply-To: <7v39k4aeos.fsf@alter.siamese.dyndns.org> On Tue, May 24, 2011 at 12:46 AM, Junio C Hamano wrote: > Jeff King writes: > >>> 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. :) > > I do not think it is sensible to expect anybody to come up with a sane > semantics for combined diff to work with GIT_EXTERNAL_DIFF (and external > diff driver that can be specified via the attributes mechanism) in any > meaningful way. Indeed, it was a thinko that I even considered it. It turns out I had been using an external diff command where I should have been using textconv all along. j.