]> git.ipfire.org Git - thirdparty/git.git/commitdiff
builtin/pull: respect verbosity settings in submodules
authorStefan Beller <sbeller@google.com>
Thu, 25 Jan 2018 19:08:17 +0000 (11:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jan 2018 19:19:21 +0000 (11:19 -0800)
In a6d7eb2c7a (pull: optionally rebase submodules (remote submodule
changes only), 2017-06-23), we taught Git how to rebase submodules in
a pull. However we missed to pass on the verbosity settings.

Reported-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/pull.c

index 7048fdf0057383e84a73f8cf55374b13beda0b2e..44474fdb71861f4a4f96ed7d2e695c945fbd50e7 100644 (file)
@@ -553,6 +553,7 @@ static int rebase_submodules(void)
        cp.no_stdin = 1;
        argv_array_pushl(&cp.args, "submodule", "update",
                                   "--recursive", "--rebase", NULL);
+       argv_push_verbosity(&cp.args);
 
        return run_command(&cp);
 }
@@ -565,6 +566,7 @@ static int update_submodules(void)
        cp.no_stdin = 1;
        argv_array_pushl(&cp.args, "submodule", "update",
                                   "--recursive", "--checkout", NULL);
+       argv_push_verbosity(&cp.args);
 
        return run_command(&cp);
 }