git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 6/8] reflog exists: use parse_options() API

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 18, 2022, 01:30 UTC
Message-ID
<xmqq35jgcail.fsf@gitster.g>
In-Reply-To
<patch-6.8-f88acdc9702-20220317T180439Z-avarab@gmail.com>
Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:
Show 29 quoted lines
> Change the "reflog exists" command added in afcb2e7a3b8 (git-reflog:
> add exists command, 2015-07-21) to use parse_options() instead of its
> own custom command-line parser. This continues work started in
> 33d7bdd6459 (builtin/reflog.c: use parse-options api for expire,
> delete subcommands, 2022-01-06).
>
> As a result we'll understand the --end-of-options synonym for "--", so
> let's test for that.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  builtin/reflog.c         | 38 ++++++++++++++++----------------------
>  t/t1418-reflog-exists.sh |  5 +++++
>  2 files changed, 21 insertions(+), 22 deletions(-)
>
> diff --git a/builtin/reflog.c b/builtin/reflog.c
> index 458764400b5..9847e9db3de 100644
> --- a/builtin/reflog.c
> +++ b/builtin/reflog.c
> @@ -27,8 +27,10 @@ static const char *const reflog_delete_usage[] = {
>  	NULL
>  };
>  
> -static const char reflog_exists_usage[] =
> -	BUILTIN_REFLOG_EXISTS_USAGE;
> +static const char *const reflog_exists_usage[] = {
> +	BUILTIN_REFLOG_EXISTS_USAGE,
> +	NULL,
> +};
Good.
The discrepanthy in the postimage of [PATCH 4/8] bothered me a lot.

This would immediately help by making it possible to feed it to parse_options(), but the uniformity will also make it easier to concatenate common and subcommand specific usage later, I would presume, if we wanted to.

Show 15 quoted lines
> +	struct option options[] = {
> +		OPT_END()
> +	};
> +	const char *refname;
>  
> +	argc = parse_options(argc, argv, prefix, options, reflog_exists_usage,
> +			     0);
> +	if (!argc)
> +		usage_with_options(reflog_exists_usage, options);
>  
> +	refname = argv[0];
> +	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
> +		die(_("invalid ref format: %s"), refname);
> +	return !reflog_exists(refname);
>  }
Quite straight-forward.  Looking good.
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 10 of 15 in “reflog: migrate fully to parse_options()”
  1. 0/8 reflog: migrate fully to parse_options()Ævar Arnfjörð Bjarmason, Mar 17, 2022
  2. 1/8 reflog.c: indent argument listsÆvar Arnfjörð Bjarmason, Mar 17, 2022
  3. John CaiMar 17, 2022
  4. 2/8 reflog: refactor cmd_reflog() to "if" branchesÆvar Arnfjörð Bjarmason, Mar 17, 2022
  5. 3/8 reflog tests: add missing "git reflog exists" testsÆvar Arnfjörð Bjarmason, Mar 17, 2022
  6. 4/8 reflog: move "usage" variables and use macrosÆvar Arnfjörð Bjarmason, Mar 17, 2022
  7. 5/8 git reflog [expire|delete]: make -h output consistent with SYNOPSISÆvar Arnfjörð Bjarmason, Mar 17, 2022
  8. Junio C HamanoMar 18, 2022
  9. 6/8 reflog exists: use parse_options() APIÆvar Arnfjörð Bjarmason, Mar 17, 2022
  10. Junio C HamanoMar 18, 2022
  11. 7/8 reflog: convert to parse_options() APIÆvar Arnfjörð Bjarmason, Mar 17, 2022
  12. Junio C HamanoMar 18, 2022
  13. 8/8 reflog [show]: display sensible -h outputÆvar Arnfjörð Bjarmason, Mar 17, 2022
  14. reflog: fix 'show' subcommand's argvSZEDER Gábor, Mar 28, 2022
  15. Junio C HamanoMar 28, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.