Re: What's cooking in git/spearce.git (Oct 2008, #01; Mon, 06)

From: Shawn O. Pearce <spearce@spearce.org>
Date: Oct 7, 2008, 14:50 UTC
Message-ID: <20081007145004.GA4674@spearce.org>
In-Reply-To: <20081006210303.GA30812@coredump.intra.peff.net>

Jeff King <peff@peff.net> wrote:

Show 17 quoted lines

> On Mon, Oct 06, 2008 at 09:59:43AM -0700, Shawn O. Pearce wrote:
> 
> > * jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
> >  - diff: add filter for converting binary to text
> >  - diff: introduce diff.<driver>.binary
> >  - diff: unify external diff and funcname parsing code
> >  - t4012: use test_cmp instead of cmp
> > 
> > A general cleanup on how diff drivers are implemented.  Its still
> > missing documentation updates and tests but doesn't break anything
> > current as far as I can tell.  It needs more review before it can
> > be slated for 'next'.
> 
> I should note, too, that this is in direct competition with Matthieu
> Moy's "Implementation of a textconv filter for easy custom diff" posted
> about a week ago. So if you are reviewing this series, please review
> both and decide which you think is more sensible.

To be clear, Jeff's series is in pu because it seems reasonable on the surface and applied cleanly to my master branch. Matthieu's branch didn't apply cleanly, and I didn't really have the time to figure out why and hand fix it.

So my carrying of Jeff's series and not Matthieu's is not an endorsement one way or the other. It was simply a matter of trying to help the topic get exposure with the least amount of effort on my part.

-- 
Shawn.