From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Wed, 15 May 2013 17:33:12 GMT
Subject: Re: Lines missing from git diff-tree -p -c output?
Message-ID: <20130515173312.GR25742@login.drsnuggles.stderr.nl>
In-Reply-To: <7vhai4cgco.fsf@alter.siamese.dyndns.org>

Hi Junio,

> I think the coalescing of two adjacent hunks into one is painting
> leading lines "interesting to show context but not worth showing
> deletion before it" incorrectly.
Yup, that seems to be the case.

> Does this patch fix the issue?

Yes, it fixes the issue. However, I think that this patch actually hides
the real problem (in a way that will always work with the current code,
though).

I had come up with a different fix myself (similar to the one I sent to
the list as a followup, but that one still had a bug), which I think
might be better. In any case, it includes a testcase for this bug which
seems good to include.

I'll send my patch as a followup in a minute, feel free to use it
entirely or only partially.

Gr.

Matthijs