From: Barret Rhoden <brho@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Stefan Beller <stefanbeller@gmail.com>,
Jeff Smith <whydoubt@gmail.com>, Jeff King <peff@peff.net>
Subject: Re: [PATCH] blame: add the ability to ignore commits
Date: Mon, 14 Jan 2019 10:19:56 -0500 [thread overview]
Message-ID: <20190114101956.2b899d0e@brho.roam.corp.google.com> (raw)
In-Reply-To: <xmqq1s5k16zj.fsf@gitster-ct.c.googlers.com>
On 2019-01-10 at 14:29 Junio C Hamano <gitster@pobox.com> wrote:
> > For instance, commit X does this:
> >
> > -foo(x,y);
> > +foo(x,y,z);
> >
> > Then commit Y comes along to reformat it:
> >
> > -foo(x,y,z);
> > +foo(x, y, z);
> >
> > And the history / rev-list for the file looks like:
> >
> > ---O---A---X---B---C---D---Y---E---F
> >
> > I want to ignore/skip Y and see X in the blame output.
>
> If you skip Y, the altered history would have "foo(x, y, z)" in E,
> "foo(x,y,z)" in X, and "foo(x,y)" in A. If you start blaming from
> F, you'd get E as the commit that explains the latest state. If you
> do not skip Y, you'd get Y. I am not sure how you'd get X in either
> case.
The way to do it is to let the blames get passed to Y - don't yank it
from the graph. Then when trying to pass the blames from Y to its
parent, when we get a diff chunk that Y is responsible for, instead of
keeping it on Y's suspect list, we hand the blame_entry to D. That
blame_entry will get passed all the way back to X, which also has a
diff that touches that line.
Basically we do the same blame processing as usual, but just don't let
any blames stick to Y.
Barret
next prev parent reply other threads:[~2019-01-14 15:20 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 21:30 [PATCH] blame: add the ability to ignore commits Barret Rhoden
2019-01-07 23:13 ` Junio C Hamano
2019-01-08 16:27 ` Barret Rhoden
2019-01-08 18:26 ` Junio C Hamano
2019-01-09 20:48 ` Barret Rhoden
2019-01-10 22:29 ` Junio C Hamano
2019-01-14 15:19 ` Barret Rhoden [this message]
2019-01-14 17:45 ` Junio C Hamano
2019-01-14 18:26 ` Randall S. Becker
2019-01-14 19:03 ` Barret Rhoden
2019-01-15 6:08 ` Junio C Hamano
2019-01-09 21:21 ` Stefan Beller
2019-01-08 13:12 ` Ævar Arnfjörð Bjarmason
2019-01-08 16:41 ` Barret Rhoden
2019-01-08 18:04 ` Barret Rhoden
2019-01-17 20:29 ` [PATCH v2 0/3] " Barret Rhoden
2019-01-17 20:29 ` [PATCH v2 1/3] Move init_skiplist() outside of fsck Barret Rhoden
2019-01-18 9:25 ` Johannes Schindelin
2019-01-18 9:45 ` Ævar Arnfjörð Bjarmason
2019-01-18 17:36 ` Junio C Hamano
2019-01-18 20:59 ` Johannes Schindelin
2019-01-18 21:30 ` Jeff King
2019-01-18 22:26 ` Ævar Arnfjörð Bjarmason
2019-01-22 7:12 ` Jeff King
2019-01-22 9:46 ` Ævar Arnfjörð Bjarmason
2019-01-22 17:54 ` Junio C Hamano
2019-01-22 18:28 ` Jeff King
2019-01-17 20:29 ` [PATCH v2 2/3] blame: add the ability to ignore commits and their changes Barret Rhoden
2019-01-18 9:47 ` Johannes Schindelin
2019-01-18 17:33 ` Barret Rhoden
2019-01-20 18:19 ` René Scharfe
2019-01-22 15:26 ` Barret Rhoden
2019-01-22 18:14 ` Junio C Hamano
2019-01-22 19:35 ` Barret Rhoden
2019-01-23 19:26 ` Junio C Hamano
2019-02-01 20:37 ` Barret Rhoden
2019-01-17 20:29 ` [PATCH v2 3/3] blame: add a config option to mark ignored lines Barret Rhoden
2019-01-18 10:03 ` Johannes Schindelin
2019-01-18 9:52 ` [PATCH v2 0/3] blame: add the ability to ignore commits Ævar Arnfjörð Bjarmason
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=20190114101956.2b899d0e@brho.roam.corp.google.com \
--to=brho@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.com \
--cc=whydoubt@gmail.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.
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).