Re: [PATCH v4 0/3] diff-highlight: add support for --graph option

From: Jeff King <peff@peff.net>
Date: Aug 31, 2016, 05:02 UTC
Message-ID: <20160831050229.cabhfzqcpcpvkugl@sigill.intra.peff.net>
In-Reply-To: <20160830140714.19048-1-henderson.bj@gmail.com>

On Tue, Aug 30, 2016 at 07:07:11AM -0700, Brian Henderson wrote:

Show 19 quoted lines

> On Mon, Aug 29, 2016 at 02:37:46PM -0700, Junio C Hamano wrote:
> > Brian Henderson <henderson.bj@gmail.com> writes:
> >
> > > How does this look?
> > >
> > > Drawing the graph helped me a lot in figuring out what I was
> > > actually testing. thanks!
> >
> > Yeah, I also am pleased to see the picture of what is being tested
> > in the test script.
> >
> > With your sign-off, they would have been almost perfect ;-).
> 
> doh. fixed.
> 
> I left the subject as v4, probably mostly because I have this weird aversion to
> increasing version numbers :) but I justified it by thinking that the actual
> patch set isn't changing, I just added the sign-off (and updated the commit
> messages per Jeff.) Hope that's ok.

Thanks. Here are a few patches to go on top. The first one could arguably be squashed into your first patch (and I don't mind if Junio wants to do so while applying, but I don't think it's worth you re-sending).

The second one fleshes out the test scripts a bit, now that we have them (yay!).

And the third fixes a bug that was reported to me off-list. I held back because it touches the same lines as your topic (and as a bonus, I was now able to write a test for it). It could be its own topic branch that graduates separately, but seeing as it's contrib, I don't mind one big diff-highlight potpourri topic if it makes things simpler.

  [1/3]: diff-highlight: ignore test cruft
  [2/3]: diff-highlight: add multi-byte tests
  [3/3]: diff-highlight: avoid highlighting combined diffs

-Peff