From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jeff Hostetler via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Jeff Hostetler <jeffhost@microsoft.com>
Subject: Re: [PATCH 04/16] t/helper/fsmonitor-client: cleanup call to parse_options()
Date: Mon, 14 Mar 2022 08:58:53 +0100 [thread overview]
Message-ID: <220314.86fsnlezgv.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <578c3682e2fb35af86087e6a0c277aa8766919d7.1647033303.git.gitgitgadget@gmail.com>
On Fri, Mar 11 2022, Jeff Hostetler via GitGitGadget wrote:
> From: Jeff Hostetler <jeffhost@microsoft.com>
>
> fixup! t/helper/fsmonitor-client: create IPC client to talk to \
> FSMonitor Daemon
>
> Elminate unnecessary code in cmd__fsmonitor_client() WRT
> parsing of options.
>
> Fix name of test-tool in usage.
>
> Don't localize die() message.
>
> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
> ---
> t/helper/test-fsmonitor-client.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/t/helper/test-fsmonitor-client.c b/t/helper/test-fsmonitor-client.c
> index f7a5b3a32fa..d59a640f1f9 100644
> --- a/t/helper/test-fsmonitor-client.c
> +++ b/t/helper/test-fsmonitor-client.c
> @@ -49,7 +49,7 @@ static int do_send_query(const char *token)
>
> ret = fsmonitor_ipc__send_query(token, &answer);
> if (ret < 0)
> - die(_("could not query fsmonitor--daemon"));
> + die("could not query fsmonitor--daemon");
Good, since this is just a test helper.
> write_in_full(1, answer.buf, answer.len);
> strbuf_release(&answer);
> @@ -85,8 +85,8 @@ int cmd__fsmonitor_client(int argc, const char **argv)
> const char *token = NULL;
>
> const char * const fsmonitor_client_usage[] = {
> - N_("test-helper fsmonitor-client query [<token>]"),
> - N_("test-helper fsmonitor-client flush"),
> + N_("test-tool fsmonitor-client query [<token>]"),
> + N_("test-tool fsmonitor-client flush"),
These are still marked for N_() translation.
Even if tehse were built-ins only the one containing <token> should have
N_(), as the other one is a literal command whose translation won't
change.
> NULL,
> };
>
> @@ -96,17 +96,12 @@ int cmd__fsmonitor_client(int argc, const char **argv)
> OPT_END()
> };
>
> - if (argc < 2)
> - usage_with_options(fsmonitor_client_usage, options);
> + argc = parse_options(argc, argv, NULL, options, fsmonitor_client_usage, 0);
>
> - if (argc == 2 && !strcmp(argv[1], "-h"))
> + if (argc != 1)
> usage_with_options(fsmonitor_client_usage, options);
>
> - subcmd = argv[1];
> - argv--;
> - argc++;
> -
> - argc = parse_options(argc, argv, NULL, options, fsmonitor_client_usage, 0);
> + subcmd = argv[0];
>
> setup_git_directory();
Looks good.
next prev parent reply other threads:[~2022-03-14 8:05 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 21:14 [PATCH 00/16] Builtin FSMonitor Part 2.5 Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 01/16] t/test-lib: avoid using git on LHS of pipe Jeff Hostetler via GitGitGadget
2022-03-14 6:00 ` Junio C Hamano
2022-03-11 21:14 ` [PATCH 02/16] update-index: convert advise() messages back to warning() Jeff Hostetler via GitGitGadget
2022-03-14 6:08 ` Junio C Hamano
2022-03-21 18:47 ` Jeff Hostetler
2022-03-11 21:14 ` [PATCH 03/16] compat/fsmonitor/fsm-listen-darwin: split out GCC-specific declarations Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 04/16] t/helper/fsmonitor-client: cleanup call to parse_options() Jeff Hostetler via GitGitGadget
2022-03-14 7:58 ` Ævar Arnfjörð Bjarmason [this message]
2022-03-11 21:14 ` [PATCH 05/16] fsmonitor--daemon: refactor cookie handling for readability Jeff Hostetler via GitGitGadget
2022-03-14 8:00 ` Ævar Arnfjörð Bjarmason
2022-03-14 14:49 ` Derrick Stolee
2022-03-14 17:47 ` Junio C Hamano
2022-03-21 19:26 ` Jeff Hostetler
2022-03-11 21:14 ` [PATCH 06/16] t/perf/p7519: use grep rather than egrep in test Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 07/16] t/perf/p7519: cleanup coding style Jeff Hostetler via GitGitGadget
2022-03-14 8:01 ` Ævar Arnfjörð Bjarmason
2022-03-11 21:14 ` [PATCH 08/16] t7527: add parameters to start_daemon to handle args and subshell Jeff Hostetler via GitGitGadget
2022-03-14 8:03 ` Ævar Arnfjörð Bjarmason
2022-03-11 21:14 ` [PATCH 09/16] t7527: fix && chaining in matrix_try() Jeff Hostetler via GitGitGadget
2022-03-14 6:15 ` Junio C Hamano
2022-03-11 21:14 ` [PATCH 10/16] t7527: delete unused verify_status() function Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 11/16] fsmonitor-ipc: add _() to calls to die() Jeff Hostetler via GitGitGadget
2022-03-11 21:14 ` [PATCH 12/16] compat/fsmonitor/fsm-listen-darwin: add _() to calls to error() Jeff Hostetler via GitGitGadget
2022-03-11 21:15 ` [PATCH 13/16] compat/fsmonitor/fsm-listen-win32: " Jeff Hostetler via GitGitGadget
2022-03-11 21:15 ` [PATCH 14/16] fsmonitor--daemon: add _() to calls to die() Jeff Hostetler via GitGitGadget
2022-03-11 21:15 ` [PATCH 15/16] fsmonitor--daemon: add _() to calls to error() Jeff Hostetler via GitGitGadget
2022-03-11 21:15 ` [PATCH 16/16] fsmonitor-settings: simplify initialization of settings data Jeff Hostetler via GitGitGadget
2022-03-14 19:49 ` Junio C Hamano
2022-03-15 18:26 ` Jeff Hostetler
2022-03-15 19:06 ` Junio C Hamano
2022-03-13 8:02 ` [PATCH 00/16] Builtin FSMonitor Part 2.5 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=220314.86fsnlezgv.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jeffhost@microsoft.com \
/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.
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 NNTP newsgroup(s).