Re: What's cooking in git.git (Jun 2019, #06; Wed, 26)

[Jeff King <peff@peff.net>]

On Wed, Jun 26, 2019 at 03:29:29PM -0700, Junio C Hamano wrote:

> * br/blame-ignore (2019-06-20) 9 commits
>  - blame: add a test to cover blame_coalesce()
>  - blame: use the fingerprint heuristic to match ignored lines
>  - blame: add a fingerprint heuristic to match ignored lines
>  - blame: optionally track line fingerprints during fill_blame_origin()
>  - blame: add config options for the output of ignored or unblamable lines
>  - blame: add the ability to ignore commits and their changes
>  - blame: use a helper function in blame_chunk()
>  - Move oidset_parse_file() to oidset.c
>  - fsck: rename and touch up init_skiplist()
> 
>  "git blame" learned to "ignore" commits in the history, whose
>  effects (as well as their presence) get ignored.
> 
>  Will merge to 'next'.
>  cf. <20190620163820.231316-1-brho@google.com> (v9)

My -Wunused-parameter branch complained about merging with this. Since
it's in 'next', we'd want something like this on top, I think (ideally
after Barret confirms my hand-waving below).

-- >8 --
Subject: [PATCH] blame: drop some unused function parameters

These unused parameters were introduced recently as part of the
br/blame-ignore topic. I assume they are not indicative of bugs, but are
just leftovers from the development process (they were introduced by the
series but not used in any of its iterations).

Signed-off-by: Jeff King <peff@peff.net>
---
 blame.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/blame.c b/blame.c
index 86f6b2bd33..acb1bf7f7a 100644
--- a/blame.c
+++ b/blame.c
@@ -981,7 +981,7 @@ static int *fuzzy_find_matching_lines(struct blame_origin *parent,
 	return result;
 }
 
-static void fill_origin_fingerprints(struct blame_origin *o, mmfile_t *file)
+static void fill_origin_fingerprints(struct blame_origin *o)
 {
 	int *line_starts;
 
@@ -1035,7 +1035,7 @@ static void fill_origin_blob(struct diff_options *opt,
 	else
 		*file = o->file;
 	if (fill_fingerprints)
-		fill_origin_fingerprints(o, file);
+		fill_origin_fingerprints(o);
 }
 
 static void drop_origin_blob(struct blame_origin *o)
@@ -1653,7 +1653,6 @@ static void guess_line_blames(struct blame_origin *parent,
  */
 static void ignore_blame_entry(struct blame_entry *e,
 			       struct blame_origin *parent,
-			       struct blame_origin *target,
 			       struct blame_entry **diffp,
 			       struct blame_entry **ignoredp,
 			       struct blame_line_tracker *line_blames)
@@ -1802,7 +1801,7 @@ static void blame_chunk(struct blame_entry ***dstq, struct blame_entry ***srcq,
 			samep = n;
 		}
 		if (ignore_diffs) {
-			ignore_blame_entry(e, parent, target, &diffp, &ignoredp,
+			ignore_blame_entry(e, parent, &diffp, &ignoredp,
 					   line_blames + e->s_lno - tlno);
 		} else {
 			e->next = diffp;
-- 
2.22.0.761.gd0932b09c9