mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/unused-fixes'

Browse Source 
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()
This commit is contained in:
Junio C Hamano
2022-08-29 14:55:12 -07:00
parent a572a5d4c1 12a58f9014
commit a0ab573bb1
11 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
log-tree.c
View File

@ -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);