diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-29 14:55:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-29 14:55:12 -0700 |
| commit | a0ab573bb1157bee2d5567c9fc22ff96a4d8c6bb (patch) | |
| tree | 36f01c5734dc0541c61493651e234ab7f64dc09e /log-tree.c | |
| parent | a572a5d4c1a00f276b4b6ed4e86cdb3d9aed51dc (diff) | |
| parent | 12a58f9014e037b4dcee5e427844461b960151d3 (diff) | |
| download | git-a0ab573bb1157bee2d5567c9fc22ff96a4d8c6bb.tar.gz | |
Merge branch 'jk/unused-fixes'
Code clean-up to remove unused function parameters.
* jk/unused-fixes:
xdiff: drop unused mmfile parameters from xdl_do_patience_diff()
reflog: assert PARSE_OPT_NONEG in parse-options callbacks
reftable: drop unused parameter from reader_seek_linear()
verify_one_sparse(): drop unused parameters
match_pathname(): drop unused "flags" parameter
log-tree: drop unused commit param in remerge_diff()
xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
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 bb6cbceee6..3e8c70ddcf 100644 --- a/log-tree.c +++ b/log-tree.c @@ -963,8 +963,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; @@ -1059,7 +1058,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); |