From: Jeff King <peff@peff.net>
Date: Mon, 23 May 2011 20:15:29 GMT
Subject: Re: combined diff does not detect binary files and ignores -diff attribute
Message-ID: <20110523201529.GA6281@sigill.intra.peff.net>
In-Reply-To: <20110523181147.GA26035@sigill.intra.peff.net>

On Mon, May 23, 2011 at 02:11:47PM -0400, Jeff King wrote:

> On Mon, May 23, 2011 at 11:17:14AM -0400, Jay Soffian wrote:
> 
> > > We know, but we somehow got stuck, see:
> > >
> > > http://permalink.gmane.org/gmane.comp.version-control.git/171613
> > >
> > > I don't have the time to follow up on this currently, it got out of
> > > proportion.
> > 
> > Drat, seems like the perfect being the enemy of the good there. I
> > wonder if Junio's patch in that thread isn't good enough for now.
> 
> I'll have a patch series in a few minutes that at least handles the
> binary case. I'll see how painful the textconv bit is on top of that.

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
  [4/5]: refactor get_textconv to not require diff_filespec
  [5/5]: combine-diff: respect textconv attributes

-Peff