From: Matthijs Kooijman <matthijs@stdin.nl>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Lines missing from git diff-tree -p -c output?
Date: Wed, 15 May 2013 19:33:12 +0200 [thread overview]
Message-ID: <20130515173312.GR25742@login.drsnuggles.stderr.nl> (raw)
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
next prev parent reply other threads:[~2013-05-15 17:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-15 14:35 Lines missing from git diff-tree -p -c output? Matthijs Kooijman
2013-05-15 15:46 ` Matthijs Kooijman
2013-05-15 17:17 ` Junio C Hamano
2013-05-15 17:33 ` Matthijs Kooijman [this message]
2013-05-15 17:42 ` [PATCH] combine-diff.c: Fix output when changes are exactly 3 lines apart Matthijs Kooijman
2013-05-15 17:48 ` Lines missing from git diff-tree -p -c output? Junio C Hamano
2013-05-15 18:17 ` Matthijs Kooijman
2013-05-15 19:13 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130515173312.GR25742@login.drsnuggles.stderr.nl \
--to=matthijs@stdin.nl \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).