git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael Platings <michael@platin.gs>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Barret Rhoden" <brho@google.com>,
	"Git mailing list" <git@vger.kernel.org>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"David Kastrup" <dak@gnu.org>, "Jeff King" <peff@peff.net>,
	"Jeff Smith" <whydoubt@gmail.com>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"René Scharfe" <l.s.r@web.de>,
	"Stefan Beller" <stefanbeller@gmail.com>
Subject: Re: [PATCH v7 7/8 (edit)] blame: add a fingerprint heuristic to match ignored lines
Date: Mon, 20 May 2019 21:32:24 +0100	[thread overview]
Message-ID: <CAJDYR9Qm+oQ=Lv53v_zrYaG2pW_TggD4q2ENEa7bR4z900fXyw@mail.gmail.com> (raw)
In-Reply-To: <xmqqftpd3br1.fsf@gitster-ct.c.googlers.com>

Hi Junio,
The SQUASH??? patches look good to me. Please squash away!
Thanks,
-Michael

On Fri, 17 May 2019 at 06:12, Junio C Hamano <gitster@pobox.com> wrote:
>
> Barret Rhoden <brho@google.com> writes:
>
> > From: Michael Platings <michael@platin.gs>
> >
> > ...
> > Michael removed the bashisms from the tests.
>
> Will replace what's queued.
>
> Note that I have two extra SQUASH??? patches on top of the branch to
> make 'pu' build and test, which you may want to take a look at.
>
> Thanks.
>
>
>
>
> From 82e68b47261ae57e7b368b9eed3450dbbf76e3c1 Mon Sep 17 00:00:00 2001
> From: Junio C Hamano <gitster@pobox.com>
> Date: Thu, 16 May 2019 12:43:27 +0900
> Subject: [PATCH 1/2] SQUASH??? error: decl-after-stmt
>
> ---
>  blame.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/blame.c b/blame.c
> index d55e458770..287841364b 100644
> --- a/blame.c
> +++ b/blame.c
> @@ -925,9 +925,6 @@ static int *fuzzy_find_matching_lines(struct blame_origin *parent,
>         struct fingerprint *fingerprints_a = parent->fingerprints;
>         struct fingerprint *fingerprints_b = target->fingerprints;
>
> -       if (length_a <= 0)
> -               return NULL;
> -
>         int i, *result, *second_best_result,
>                 *certainties, *similarities, similarity_count;
>
> @@ -943,6 +940,9 @@ static int *fuzzy_find_matching_lines(struct blame_origin *parent,
>          */
>         int max_search_distance_a = 10, max_search_distance_b;
>
> +       if (length_a <= 0)
> +               return NULL;
> +
>         if (max_search_distance_a >= length_a)
>                 max_search_distance_a = length_a ? length_a - 1 : 0;
>
> --
> 2.22.0-rc0
>
>
> From 634f3cecaaba9174e81629f8df5942c261e8310b Mon Sep 17 00:00:00 2001
> From: Junio C Hamano <gitster@pobox.com>
> Date: Fri, 17 May 2019 13:45:42 +0900
> Subject: [PATCH 2/2] SQUASH??? test-lint -- seq not portable
>
> ---
>  t/t8014-blame-ignore-fuzzy.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
> index bbf70b0f56..1ff59624e9 100755
> --- a/t/t8014-blame-ignore-fuzzy.sh
> +++ b/t/t8014-blame-ignore-fuzzy.sh
> @@ -298,7 +298,7 @@ EOF
>  last_test=13
>
>  test_expect_success setup '
> -       { for i in $(seq 2 $last_test)
> +       { for i in $(test_seq 2 $last_test)
>         do
>                 # Append each line in a separate commit to make it easy to
>                 # check which original line the blame output relates to.
> @@ -314,7 +314,7 @@ test_expect_success setup '
>                 done } <"a$i"
>         done } &&
>
> -       { for i in $(seq 2 $last_test)
> +       { for i in $(test_seq 2 $last_test)
>         do
>                 # Overwrite the files with the final content.
>                 cp b$i $i &&
> @@ -329,7 +329,7 @@ test_expect_success setup '
>         IGNOREME=$(git rev-parse HEAD)
>  '
>
> -for i in $(seq 2 $last_test); do
> +for i in $(test_seq 2 $last_test); do
>         eval title="\$title$i"
>         test_expect_success "$title" \
>         "git blame -M9 --ignore-rev $IGNOREME $i | sed -e \"$pick_author\" >actual && test_cmp expected$i actual"
> --
> 2.22.0-rc0
>

  reply	other threads:[~2019-05-20 20:32 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-15 21:44 [PATCH v7 0/8] blame: add the ability to ignore commits Barret Rhoden
2019-05-15 21:44 ` [PATCH v7 1/8] fsck: rename and touch up init_skiplist() Barret Rhoden
2019-05-15 21:44 ` [PATCH v7 2/8] Move oidset_parse_file() to oidset.c Barret Rhoden
2019-05-15 21:44 ` [PATCH v7 3/8] blame: use a helper function in blame_chunk() Barret Rhoden
2019-05-15 21:44 ` [PATCH v7 4/8] blame: add the ability to ignore commits and their changes Barret Rhoden
2019-05-15 21:45 ` [PATCH v7 5/8] blame: add config options for the output of ignored or unblamable lines Barret Rhoden
2019-05-15 21:45 ` [PATCH v7 6/8] blame: optionally track line fingerprints during fill_blame_origin() Barret Rhoden
2019-05-15 21:45 ` [PATCH v7 7/8] blame: add a fingerprint heuristic to match ignored lines Barret Rhoden
2019-05-16  7:49   ` Junio C Hamano
2019-05-16 21:57   ` [PATCH v7 7/8 (edit)] " Barret Rhoden
2019-05-17  5:12     ` Junio C Hamano
2019-05-20 20:32       ` Michael Platings [this message]
2019-05-20 20:34         ` Barret Rhoden
2019-05-28 16:39           ` Junio C Hamano
2019-05-15 21:45 ` [PATCH v7 8/8] blame: use the " 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='CAJDYR9Qm+oQ=Lv53v_zrYaG2pW_TggD4q2ENEa7bR4z900fXyw@mail.gmail.com' \
    --to=michael@platin.gs \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=avarab@gmail.com \
    --cc=brho@google.com \
    --cc=dak@gnu.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=l.s.r@web.de \
    --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).