From: Sven Strickroth <email@cs-ware.de>
To: git <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
"Robin H. Johnson" <robbat2@gentoo.org>
Subject: [PATCH] Don't pass -v to submodule command
Date: Wed, 30 Nov 2022 19:30:31 +0100 [thread overview]
Message-ID: <cad05012-7bf9-5975-3add-253b11c7bcc8@cs-ware.de> (raw)
In-Reply-To: <1ff185c5-4a9e-36e3-3141-8b149c1c7bb0@cs-ware.de>
"git pull -v --recurse-submodules" propagates the "-v" to the submdoule
command which does not support "-v".
Commit a56771a668dd4963675914bc5da0e1e015952dae introduced this
regression.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
builtin/pull.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 1ab4de0005..b67320fa5f 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -256,7 +256,7 @@ static struct option pull_options[] = {
/**
* Pushes "-q" or "-v" switches into arr to match the opt_verbosity level.
*/
-static void argv_push_verbosity(struct strvec *arr)
+static void argv_push_verbosity(struct strvec *arr, int include_v)
{
int verbosity;
@@ -520,7 +520,7 @@ static int run_fetch(const char *repo, const char **refspecs)
strvec_pushl(&cmd.args, "fetch", "--update-head-ok", NULL);
/* Shared options */
- argv_push_verbosity(&cmd.args);
+ argv_push_verbosity(&cmd.args, 1);
if (opt_progress)
strvec_push(&cmd.args, opt_progress);
@@ -629,7 +629,7 @@ static int rebase_submodules(void)
cp.no_stdin = 1;
strvec_pushl(&cp.args, "submodule", "update",
"--recursive", "--rebase", NULL);
- argv_push_verbosity(&cp.args);
+ argv_push_verbosity(&cp.args, 0);
return run_command(&cp);
}
@@ -642,7 +642,7 @@ static int update_submodules(void)
cp.no_stdin = 1;
strvec_pushl(&cp.args, "submodule", "update",
"--recursive", "--checkout", NULL);
- argv_push_verbosity(&cp.args);
+ argv_push_verbosity(&cp.args, 0);
return run_command(&cp);
}
@@ -657,7 +657,7 @@ static int run_merge(void)
strvec_pushl(&cmd.args, "merge", NULL);
/* Shared options */
- argv_push_verbosity(&cmd.args);
+ argv_push_verbosity(&cmd.args, 1);
if (opt_progress)
strvec_push(&cmd.args, opt_progress);
@@ -881,7 +881,7 @@ static int run_rebase(const struct object_id *newbase,
strvec_push(&cmd.args, "rebase");
/* Shared options */
- argv_push_verbosity(&cmd.args);
+ argv_push_verbosity(&cmd.args, 1);
/* Options passed to git-rebase */
if (opt_rebase == REBASE_MERGES)
--
2.38.1.windows.1
next prev parent reply other threads:[~2022-11-30 18:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 12:47 git pull --verbose with submodules ends in error message Fink, Mike
2022-11-25 15:56 ` Sven Strickroth
2022-11-30 18:30 ` Sven Strickroth [this message]
2022-11-30 19:17 ` [PATCH] Don't pass -v to submodule command Ævar Arnfjörð Bjarmason
2022-12-01 8:32 ` Sven Strickroth
2022-12-01 8:34 ` [PATCH v2] " Sven Strickroth
2022-12-02 0:24 ` [PATCH] " Junio C Hamano
2022-12-10 13:06 ` [PATCH] submodule: Accept -v for update command Sven Strickroth
2022-12-18 1:25 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cad05012-7bf9-5975-3add-253b11c7bcc8@cs-ware.de \
--to=email@cs-ware.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=robbat2@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).