Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes:
> 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@xxxxxxxxx>
> ---
> 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.
> + 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.
