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

Merge branch 'so/combine-diff-simplify'

Browse Source 
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
parent 58138d3f26 d01141de5a
commit 34415c76c8
6 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
submodule.c
View File

@ -865,7 +865,8 @@ static void collect_changed_submodules(struct repository *r,
diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
diff_rev.diffopt.format_callback_data = &data;
diff_tree_combined_merge(commit, 1, &diff_rev);
diff_rev.dense_combined_merges = 1;
diff_tree_combined_merge(commit, &diff_rev);
}
reset_revision_walk();