Merge branch 'rs/refspec-leakfix'

[thirdparty/git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index d0b70ca536143adc41d66a448e6b3f9243067076..6f8002fc9e2e33d650a5a3792b1faf48b4a969bf 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -438,7 +438,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
         */
 }
 
-static int prepare_submodule_summary(struct rev_info *rev, const char *path,
+static int prepare_submodule_diff_summary(struct rev_info *rev, const char *path,
                struct commit *left, struct commit *right,
                struct commit_list *merge_bases)
 {
@@ -459,7 +459,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
        return prepare_revision_walk(rev);
 }
 
-static void print_submodule_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
+static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
 {
        static const char format[] = "  %m %s";
        struct strbuf sb = STRBUF_INIT;
@@ -610,7 +610,7 @@ output_header:
        strbuf_release(&sb);
 }
 
-void show_submodule_summary(struct diff_options *o, const char *path,
+void show_submodule_diff_summary(struct diff_options *o, const char *path,
                struct object_id *one, struct object_id *two,
                unsigned dirty_submodule)
 {
@@ -632,12 +632,12 @@ void show_submodule_summary(struct diff_options *o, const char *path,
                goto out;
 
        /* Treat revision walker failure the same as missing commits */
-       if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
+       if (prepare_submodule_diff_summary(&rev, path, left, right, merge_bases)) {
                diff_emit_submodule_error(o, "(revision walker failed)\n");
                goto out;
        }
 
-       print_submodule_summary(sub, &rev, o);
+       print_submodule_diff_summary(sub, &rev, o);
 
 out:
        if (merge_bases)
@@ -1726,14 +1726,6 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 int submodule_uses_gitfile(const char *path)
 {
        struct child_process cp = CHILD_PROCESS_INIT;
-       const char *argv[] = {
-               "submodule",
-               "foreach",
-               "--quiet",
-               "--recursive",
-               "test -f .git",
-               NULL,
-       };
        struct strbuf buf = STRBUF_INIT;
        const char *git_dir;
 
@@ -1746,7 +1738,10 @@ int submodule_uses_gitfile(const char *path)
        strbuf_release(&buf);
 
        /* Now test that all nested submodules use a gitfile too */
-       cp.argv = argv;
+       strvec_pushl(&cp.args,
+                    "submodule", "foreach", "--quiet", "--recursive",
+                    "test -f .git", NULL);
+
        prepare_submodule_repo_env(&cp.env_array);
        cp.git_cmd = 1;
        cp.no_stdin = 1;