config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag

[thirdparty/git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index 543b1123ae1264eeb891a2e6e4ab7939180b004b..b3bb59f06644739c859adb22836e2761da2a91be 100644 (file)
--- 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();