log-tree: drop unused commit param in remerge_diff()
This function has never used its "commit" parameter since it was added in db757e8b8d (show, log: provide a --remerge-diff capability, 2022-02-02). This makes sense; we already have separate parameters for the parents (which lets us redo the merge) and the oid of the result tree (which we can then diff against the remerge result). Let's drop the unused parameter in the name of clarity. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Aug 19, 2022 at 04:50 UTC
e2841f706ecf449c67514c253d80445b9db9a08b
1 file changed
+2
-3
log-tree.c
+2
-3
@@ -956,8 +956,7 @@ static void cleanup_additional_headers(struct diff_options *o)
956
957
static int do_remerge_diff(struct rev_info *opt,
958
struct commit_list *parents,
959
- struct object_id *oid,
960
- struct commit *commit)
959
+ struct object_id *oid)
960
{
961
struct merge_options o;
962
struct commit_list *bases;
@@ -1052,7 +1051,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
1051
"for octopus merges.\n");
1052
return 1;
1053
}
1055
- return do_remerge_diff(opt, parents, oid, commit);
1054
+ return do_remerge_diff(opt, parents, oid);
1055
}
1056
if (opt->combine_merges)
1057
return do_diff_combined(opt, commit);