Imported Upstream version 2.14.6

[platform/upstream/git.git] / builtin / clone.c

diff --git a/builtin/clone.c b/builtin/clone.c
index 08b5cc4..44b7169 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -757,7 +757,7 @@ static int checkout(int submodule_progress)
 
        if (!err && (option_recurse_submodules.nr > 0)) {
                struct argv_array args = ARGV_ARRAY_INIT;
-               argv_array_pushl(&args, "submodule", "update", "--init", "--recursive", NULL);
+               argv_array_pushl(&args, "submodule", "update", "--require-init", "--recursive", NULL);
 
                if (option_shallow_submodules == 1)
                        argv_array_push(&args, "--depth=1");
@@ -768,6 +768,9 @@ static int checkout(int submodule_progress)
                if (submodule_progress)
                        argv_array_push(&args, "--progress");
 
+               if (option_verbosity < 0)
+                       argv_array_push(&args, "--quiet");
+
                err = run_command_v_opt(args.argv, RUN_GIT_CMD);
                argv_array_clear(&args);
        }