git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: michael@platin.gs
To: 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>,
	"Barret Rhoden" <brho@google.com>,
	"Michael Platings" <michael@platin.gs>
Subject: [PATCH] blame - fix some issues identified by coverage report.
Date: Sat,  1 Jun 2019 22:09:25 +0100	[thread overview]
Message-ID: <20190601210925.15339-1-michael@platin.gs> (raw)
In-Reply-To: <Re: [PATCH v7 7/8] blame: add a fingerprint heuristic to match ignored lines>

From: Michael Platings <michael@platin.gs>

Thanks to Derrick Stolee for highlighting missing coverage.

In the case of "certainties[i] = CERTAINTY_NOT_CALCULATED" this was
defeating an optimization that preserved results of calculations
between line-matching passes. This had caused other code to never
be executed - that code is now executed and only discards calculation
results that are no longer valid.

In the case of "max_search_distance_b = 0" this was never executed
because another statement was added earlier in the function to return
early in such a case.

Signed-off-by: Michael Platings <michael@platin.gs>
---
 blame.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/blame.c b/blame.c
index c059063688..2b47c942db 100644
--- a/blame.c
+++ b/blame.c
@@ -825,10 +825,6 @@ static void fuzzy_find_matching_lines_recurse(
 		*get_similarity(similarities, most_certain_line_a - start_a,
 				i, closest_local_line_a,
 				max_search_distance_a) = -1;
-
-		if (certainties[i] >= 0) {
-			certainties[i] = CERTAINTY_NOT_CALCULATED;
-		}
 	}
 
 	/* More invalidating of results that may be affected by the choice of
@@ -947,12 +943,8 @@ static int *fuzzy_find_matching_lines(struct blame_origin *parent,
 	if (max_search_distance_a >= length_a)
 		max_search_distance_a = length_a ? length_a - 1 : 0;
 
-	if (length_a == 0) {
-		max_search_distance_b = 0;
-	} else {
-		max_search_distance_b = ((2 * max_search_distance_a + 1) *
-			length_b - 1) / length_a;
-	}
+	max_search_distance_b = ((2 * max_search_distance_a + 1) *
+		length_b - 1) / length_a;
 
 	result = xcalloc(sizeof(int), length_b);
 	second_best_result = xcalloc(sizeof(int), length_b);
-- 
2.21.0


       reply	other threads:[~2019-06-01 21:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <Re: [PATCH v7 7/8] blame: add a fingerprint heuristic to match ignored lines>
2019-06-01 21:09 ` michael [this message]
2019-06-03 15:26   ` [PATCH] blame - fix some issues identified by coverage report Barret Rhoden
2019-06-03 18:08     ` 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

  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=20190601210925.15339-1-michael@platin.gs \
    --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).