Merge branch 'so/combine-diff-simplify'

Code simplification.

* so/combine-diff-simplify:
  diff: get rid of redundant 'dense' argument
This commit is contained in:
Junio C Hamano
2020-10-05 14:01:51 -07:00
6 changed files with 18 additions and 23 deletions

View File

@ -885,7 +885,7 @@ int log_tree_diff_flush(struct rev_info *opt)
static int do_diff_combined(struct rev_info *opt, struct commit *commit)
{
diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
diff_tree_combined_merge(commit, opt);
return !opt->loginfo;
}