Skip to content

Commit e2841f7

Browse files
peffgitster
authored andcommitted
log-tree: drop unused commit param in remerge_diff()
This function has never used its "commit" parameter since it was added in db757e8 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f1d0190 commit e2841f7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

log-tree.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -956,8 +956,7 @@ static void cleanup_additional_headers(struct diff_options *o)
956956

957957
static int do_remerge_diff(struct rev_info *opt,
958958
struct commit_list *parents,
959-
struct object_id *oid,
960-
struct commit *commit)
959+
struct object_id *oid)
961960
{
962961
struct merge_options o;
963962
struct commit_list *bases;
@@ -1052,7 +1051,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
10521051
"for octopus merges.\n");
10531052
return 1;
10541053
}
1055-
return do_remerge_diff(opt, parents, oid, commit);
1054+
return do_remerge_diff(opt, parents, oid);
10561055
}
10571056
if (opt->combine_merges)
10581057
return do_diff_combined(opt, commit);

0 commit comments

Comments
 (0)