diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:51 -0700 |
| commit | 34415c76c8f67c8692090ef4911d1626689e8f38 (patch) | |
| tree | 394d71e84f1909532a6a0e1654d3ff314a9bd39b /submodule.c | |
| parent | 58138d3f266569f945a7abc86fc897111c47640f (diff) | |
| parent | d01141de5ab02cf4a156183ef4dc5ee8bf2638a3 (diff) | |
| download | git-34415c76c8f67c8692090ef4911d1626689e8f38.tar.gz | |
Merge branch 'so/combine-diff-simplify'
Code simplification.
* so/combine-diff-simplify:
diff: get rid of redundant 'dense' argument
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 543b1123ae..b3bb59f066 100644 --- a/submodule.c +++ b/submodule.c @@ -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(); |