First batch

[thirdparty/git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index b84438b7e09dd214d09a2254a93179825f7d737a..b3bb59f06644739c859adb22836e2761da2a91be 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -438,13 +438,14 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
         */
 }
 
-static int prepare_submodule_diff_summary(struct rev_info *rev, const char *path,
-               struct commit *left, struct commit *right,
-               struct commit_list *merge_bases)
+static int prepare_submodule_diff_summary(struct repository *r, struct rev_info *rev,
+                                         const char *path,
+                                         struct commit *left, struct commit *right,
+                                         struct commit_list *merge_bases)
 {
        struct commit_list *list;
 
-       repo_init_revisions(the_repository, rev, NULL);
+       repo_init_revisions(r, rev, NULL);
        setup_revisions(0, NULL, rev, NULL);
        rev->left_right = 1;
        rev->first_parent_only = 1;
@@ -632,7 +633,7 @@ void show_submodule_diff_summary(struct diff_options *o, const char *path,
                goto out;
 
        /* Treat revision walker failure the same as missing commits */
-       if (prepare_submodule_diff_summary(&rev, path, left, right, merge_bases)) {
+       if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) {
                diff_emit_submodule_error(o, "(revision walker failed)\n");
                goto out;
        }
@@ -864,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();