diff options
| author | Jeff King <peff@peff.net> | 2022-08-19 11:50:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 22:20:43 +0300 |
| commit | e2841f706ecf449c67514c253d80445b9db9a08b (patch) | |
| tree | 8d0953366a64f0c608e8f302659c0c44e8a05ba5 /log-tree.c | |
| parent | f1d019071ea68cb2bd2602b925d7a3726ded22e9 (diff) | |
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>
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/log-tree.c b/log-tree.c index d0ac0a6327..82d9b5f650 100644 --- a/log-tree.c +++ b/log-tree.c @@ -956,8 +956,7 @@ static void cleanup_additional_headers(struct diff_options *o) static int do_remerge_diff(struct rev_info *opt, struct commit_list *parents, - struct object_id *oid, - struct commit *commit) + struct object_id *oid) { struct merge_options o; struct commit_list *bases; @@ -1052,7 +1051,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log "for octopus merges.\n"); return 1; } - return do_remerge_diff(opt, parents, oid, commit); + return do_remerge_diff(opt, parents, oid); } if (opt->combine_merges) return do_diff_combined(opt, commit); |