From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, "Jeff King" <peff@peff.net>,
"René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH 03/10] run-command API: add and use a run_command_l_opt()
Date: Fri, 14 Oct 2022 11:40:27 -0700 [thread overview]
Message-ID: <xmqqtu468d0k.fsf@gitster.g> (raw)
In-Reply-To: <patch-03.10-fd81d44f221-20221014T153426Z-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Fri, 14 Oct 2022 17:40:15 +0200")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> bisect.c | 19 +++++++++----------
> builtin/clone.c | 16 ++++++----------
> builtin/difftool.c | 14 ++++++--------
> builtin/gc.c | 22 ++++++++--------------
> builtin/merge.c | 35 ++++++-----------------------------
> builtin/remote.c | 10 ++++------
> compat/mingw.c | 8 +++-----
> ll-merge.c | 4 +---
> run-command.c | 15 +++++++++++++++
> run-command.h | 13 +++++++++++--
> sequencer.c | 4 +---
> t/helper/test-fake-ssh.c | 4 +---
> 12 files changed, 71 insertions(+), 93 deletions(-)
Nice.
> @@ -862,11 +858,11 @@ static void write_refspec_config(const char *src_ref_prefix,
>
> static void dissociate_from_references(void)
> {
> - static const char* argv[] = { "repack", "-a", "-d", NULL };
Good to see that this one in a wrong scope can now go away.
> char *alternates = git_pathdup("objects/info/alternates");
>
> if (!access(alternates, F_OK)) {
> - if (run_command_v_opt(argv, RUN_GIT_CMD|RUN_COMMAND_NO_STDIN))
> + if (run_command_l_opt(RUN_GIT_CMD|RUN_COMMAND_NO_STDIN,
> + "repack", "-a", "-d", NULL))
> die(_("cannot repack to clean up"));
> diff --git a/builtin/remote.c b/builtin/remote.c
> index 910f7b9316a..1d86c14297b 100644
> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -92,13 +92,11 @@ static int verbose;
>
> static int fetch_remote(const char *name)
> {
> - const char *argv[] = { "fetch", name, NULL, NULL };
> - if (verbose) {
> - argv[1] = "-v";
> - argv[2] = name;
> - }
> printf_ln(_("Updating %s"), name);
> - if (run_command_v_opt(argv, RUN_GIT_CMD))
> + if (verbose && run_command_l_opt(RUN_GIT_CMD, "-v", "fetch", name,
> + NULL))
> + return error(_("Could not fetch %s"), name);
> + else if (run_command_l_opt(RUN_GIT_CMD, "fetch", name, NULL))
> return error(_("Could not fetch %s"), name);
> return 0;
> }
This, together with the "merge" one that used to be conditional
(which I take as a sign that new callers can legitimately wish it to
be conditional again), is where the new l_opt() variant is weak.
And the above is wrong. If verbose option is given and run command
succeeds in running "fetch -v" (another bug is that the updated code
is running "git -v fetch <name>"), we will try running "fetch" without
"-v" option after that.
So, for simplest things (i.e. the majority of places this patch
touches), addition of l_opt() is great. Use of it for nontrivial
things like this is not. We need to repeat ourselves, and the use
of API is error prone.
> diff --git a/compat/mingw.c b/compat/mingw.c
> index 901375d5841..4f5392c5796 100644
> --- a/compat/mingw.c
> +++ b/compat/mingw.c
> @@ -196,17 +196,15 @@ static int read_yes_no_answer(void)
> static int ask_yes_no_if_possible(const char *format, ...)
> {
> char question[4096];
> - const char *retry_hook[] = { NULL, NULL, NULL };
Good to see that this one in a wrong scope can now go away.
> + char *retry_hook;
> va_list args;
>
> va_start(args, format);
> vsnprintf(question, sizeof(question), format, args);
> va_end(args);
>
> - if ((retry_hook[0] = mingw_getenv("GIT_ASK_YESNO"))) {
> - retry_hook[1] = question;
> - return !run_command_v_opt(retry_hook, 0);
> - }
> + if ((retry_hook = mingw_getenv("GIT_ASK_YESNO")))
> + return !run_command_l_opt(0, retry_hook, question, NULL);
>
> if (!isatty(_fileno(stdin)) || !isatty(_fileno(stderr)))
> return 0;
next prev parent reply other threads:[~2022-10-14 18:40 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-14 15:40 [PATCH 00/10] run-command API: add run_command_{l,sv}_opt() Ævar Arnfjörð Bjarmason
2022-10-14 15:40 ` [PATCH 01/10] run-command.c: refactor run_command_*_tr2() to internal helpers Ævar Arnfjörð Bjarmason
2022-10-14 18:22 ` Junio C Hamano
2022-10-14 15:40 ` [PATCH 02/10] merge: remove always-the-same "verbose" arguments Ævar Arnfjörð Bjarmason
2022-10-14 18:31 ` Junio C Hamano
2022-10-14 15:40 ` [PATCH 03/10] run-command API: add and use a run_command_l_opt() Ævar Arnfjörð Bjarmason
2022-10-14 18:40 ` Junio C Hamano [this message]
2022-10-14 20:03 ` Jeff King
2022-10-14 20:27 ` Junio C Hamano
2022-10-14 15:40 ` [PATCH 04/10] am: use run_command_l_opt() for show_patch() Ævar Arnfjörð Bjarmason
2022-10-14 18:43 ` Junio C Hamano
2022-10-14 15:40 ` [PATCH 05/10] run-command API docs: clarify & fleshen out run_command_v_opt*() docs Ævar Arnfjörð Bjarmason
2022-10-14 15:40 ` [PATCH 06/10] run-command API: remove RUN_COMMAND_STDOUT_TO_STDERR flag Ævar Arnfjörð Bjarmason
2022-10-14 15:40 ` [PATCH 07/10] run-command API & diff.c: remove run_command_v_opt_cd_env() Ævar Arnfjörð Bjarmason
2022-10-14 15:40 ` [PATCH 08/10] run-command API & users: remove run_command_v_opt_tr2() Ævar Arnfjörð Bjarmason
2022-10-14 15:40 ` [PATCH 09/10] gc: use strvec_pushf(), avoid redundant strbuf_detach() Ævar Arnfjörð Bjarmason
2022-10-14 15:40 ` [PATCH 10/10] run-command API: add and use a run_command_sv_opt() Ævar Arnfjörð Bjarmason
2022-10-14 19:21 ` René Scharfe
2022-10-17 17:49 ` [PATCH v2 00/10] run-command API: add run_command_{l,sv}_opt() Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 01/10] run-command.c: refactor run_command_*_tr2() to internal helpers Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 02/10] merge: remove always-the-same "verbose" arguments Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 03/10] run-command API: add and use a run_command_l_opt() Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 04/10] am: use run_command_l_opt() for show_patch() Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 05/10] run-command API docs: clarify & fleshen out run_command_v_opt*() docs Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 06/10] run-command API: remove RUN_COMMAND_STDOUT_TO_STDERR flag Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 07/10] run-command API & diff.c: remove run_command_v_opt_cd_env() Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 08/10] run-command API & users: remove run_command_v_opt_tr2() Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 09/10] gc: use strvec_pushf(), avoid redundant strbuf_detach() Ævar Arnfjörð Bjarmason
2022-10-17 17:49 ` [PATCH v2 10/10] run-command API: add and use a run_command_sv_opt() Ævar Arnfjörð Bjarmason
2022-10-18 9:11 ` [PATCH v2 00/10] run-command API: add run_command_{l,sv}_opt() Junio C Hamano
2022-10-18 13:28 ` Ævar Arnfjörð Bjarmason
2022-10-18 20:42 ` Jeff King
2022-10-19 15:43 ` Junio C Hamano
2022-10-19 17:06 ` Jeff King
2022-10-19 18:00 ` Junio C Hamano
2022-10-19 18:57 ` Jeff King
2022-10-19 19:41 ` Junio C Hamano
2022-10-20 18:34 ` René Scharfe
2022-10-20 23:50 ` 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=xmqqtu468d0k.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
/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).