From: Barret Rhoden <brho@google.com>
To: michael@platin.gs, git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"Stefan Beller" <stefanbeller@gmail.com>,
"Jeff Smith" <whydoubt@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <l.s.r@web.de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"David Kastrup" <dak@gnu.org>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v6 0/6] blame: add the ability to ignore commits
Date: Tue, 23 Apr 2019 10:23:44 -0400 [thread overview]
Message-ID: <cc1466bc-0610-784b-e57b-8612c2e8569f@google.com> (raw)
In-Reply-To: <20190422222647.48628-1-michael@platin.gs>
On 4/22/19 6:26 PM, michael@platin.gs wrote:
> From: Michael Platings <michael@platin.gs>
>
> Hi Barret,
>
> This patch is on top of your patch v6 4/6.
Thanks, I'll take a look. I was working on taking your old version and
integrating it with my v6 6/6. That way it gets the
origin-fingerprint-filling code and can be easily compared to my 6/6 style.
[snip]
>
> To address reordered lines I suggest a combination of this algorithm and your
> algorithm - in the first path my algorithm tries to match lines within a
> single chunk, and in the second pass your algorithm tries to find matches for
> unblamed lines out of order and outside their chunk.
I was thinking something similar. Yesterday I did this with your older
patch set - applied on my 6/6. Two passes, one with your fuzzy matcher,
then if we didn't find anything, do a scan of the entire parent (as my
6/6 does now).
This approached worked for the cases I had (e.g. "header reordering").
I ran into an issue last night where your scan was finding matches where
it shouldn't - might have been an issue with how I hooked it up. I'll
try your latest code and see how it goes.
Thanks,
Barret
next prev parent reply other threads:[~2019-04-23 14:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <[PATCH v6 0/6] blame: add the ability to ignore commits>
2019-04-22 22:26 ` [PATCH v6 0/6] blame: add the ability to ignore commits michael
2019-04-23 14:23 ` Barret Rhoden [this message]
2019-04-23 18:13 ` Barret Rhoden
2019-04-23 20:17 ` Barret Rhoden
2019-04-23 21:21 ` Barret Rhoden
2019-04-24 21:07 ` Barret Rhoden
2019-04-10 16:24 Barret Rhoden
2019-04-14 21:10 ` Michael Platings
2019-04-15 13:23 ` Barret Rhoden
2019-04-15 21:54 ` Michael Platings
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=cc1466bc-0610-784b-e57b-8612c2e8569f@google.com \
--to=brho@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=dak@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=michael@platin.gs \
--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).