From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Barret Rhoden <brho@google.com>, Nuthan Munaiah <nm6061@rit.edu>,
git@vger.kernel.org
Subject: [PATCH 0/3] blame: fix bug in coalescing non-adjacent "-L" chunks
Date: Thu, 13 Aug 2020 01:20:54 -0400 [thread overview]
Message-ID: <20200813052054.GA1962792@coredump.intra.peff.net> (raw)
In-Reply-To: <20200807223522.GB3750245@coredump.intra.peff.net>
On Fri, Aug 07, 2020 at 06:35:22PM -0400, Jeff King wrote:
> > > I think the only conceivable case is that in the middle of a single
> > > block of text in an ancient version, another block of lines gets
> > > inserted during the evolution of the file, but in the end these
> > > intermediate edits all go away and the same original text remains.
> > >
> > > In such a case, without coalescing, we would not treat the original
> > > single block of text as a single unit.
> >
> > Yeah, that makes sense, and it should be possible to construct a case
> > based on that.
I started to add a test for this, and it turns out we already had one!
It just wasn't checking the output as carefully as it could. :)
So here's a series which actually checks that blame_coalesce() is doing
something useful, and then fixes Nuthan's bug on top (with a test case,
but I also confirmed it makes the original tomcat issue go away).
[1/3]: t8003: check output of coalesced blame
[2/3]: t8003: factor setup out of coalesce test
[3/3]: blame: only coalesce lines that are adjacent in result
blame.c | 1 +
t/t8003-blame-corner-cases.sh | 28 +++++++++++++++++++---------
2 files changed, 20 insertions(+), 9 deletions(-)
-Peff
next prev parent reply other threads:[~2020-08-13 5:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-07 1:05 `git blame` Line Number Off-by-one Nuthan Munaiah
2020-08-07 21:21 ` Jeff King
2020-08-07 21:33 ` Jeff King
2020-08-07 21:45 ` Jeff King
2020-08-07 22:05 ` Junio C Hamano
2020-08-07 22:26 ` Jeff King
2020-08-07 22:35 ` Jeff King
2020-08-13 5:20 ` Jeff King [this message]
2020-08-13 5:23 ` [PATCH 1/3] t8003: check output of coalesced blame Jeff King
2020-08-13 17:04 ` Junio C Hamano
2020-08-13 17:22 ` Jeff King
2020-08-13 5:23 ` [PATCH 2/3] t8003: factor setup out of coalesce test Jeff King
2020-08-13 5:25 ` [PATCH 3/3] blame: only coalesce lines that are adjacent in result Jeff King
2020-08-13 16:59 ` Junio C Hamano
2020-08-13 18:41 ` Junio C Hamano
2020-08-13 12:25 ` [PATCH 0/3] blame: fix bug in coalescing non-adjacent "-L" chunks Barret Rhoden
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200813052054.GA1962792@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=brho@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nm6061@rit.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).