From: Jay Soffian Date: Mon, 23 May 2011 23:31:02 GMT Subject: Re: combined diff does not detect binary files and ignores -diff attribute Message-ID: In-Reply-To: On Mon, May 23, 2011 at 6:55 PM, Jay Soffian wrote: >>  [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. Okay, tested these now. I noticed two tiny issues unrelated to this series, but rather since this is the first time I've used textconv. 1. The temporary path git generates loses the original file extension. At least in the case of Mac OS X, ibtool gets angry when the ".xib" isn' there. I worked around this with a wrapper, but maybe git could preserve the extension. 2. It's not really clear to me when one should use textconv vs a custom diff driver. (Also, --no-textconv isn't documented...). Thanks, j.