mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reflog exists: use parse_options() API

Browse Source 
Change the "reflog exists" command added in afcb2e7a3b (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
33d7bdd645 (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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-03-17 19:08:38 +01:00
committed by Junio C Hamano
parent cbe485298b
commit a34393f5f8
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
builtin/reflog.c
View File

@ -27,8 +27,10 @@ static const char *const reflog_delete_usage[] = {
NULL NULL
}; };
static const char reflog_exists_usage[] = static const char *const reflog_exists_usage[] = {
BUILTIN_REFLOG_EXISTS_USAGE; BUILTIN_REFLOG_EXISTS_USAGE,
NULL,
};
static timestamp_t default_reflog_expire; static timestamp_t default_reflog_expire;
static timestamp_t default_reflog_expire_unreachable; static timestamp_t default_reflog_expire_unreachable;
@ -350,28 +352,20 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
static int cmd_reflog_exists(int argc, const char **argv, const char *prefix) static int cmd_reflog_exists(int argc, const char **argv, const char *prefix)
{ {
int i, start = 0; struct option options[] = {
OPT_END()
};
const char *refname;
for (i = 1; i < argc; i++) { argc = parse_options(argc, argv, prefix, options, reflog_exists_usage,
const char *arg = argv[i]; 0);
if (!strcmp(arg, "--")) { if (!argc)
i++; usage_with_options(reflog_exists_usage, options);
break;
}
else if (arg[0] == '-')
usage(_(reflog_exists_usage));
else
break;
}
start = i; refname = argv[0];
if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
if (argc - start != 1) die(_("invalid ref format: %s"), refname);
usage(_(reflog_exists_usage)); return !reflog_exists(refname);
if (check_refname_format(argv[start], REFNAME_ALLOW_ONELEVEL))
die(_("invalid ref format: %s"), argv[start]);
return !reflog_exists(argv[start]);
} }
/* /*

5
t/t1418-reflog-exists.sh
View File

@ -29,4 +29,9 @@ test_expect_success 'reflog exists works with a "--" delimiter' '
test_must_fail git reflog exists -- refs/heads/nonexistent test_must_fail git reflog exists -- refs/heads/nonexistent
' '
test_expect_success 'reflog exists works with a "--end-of-options" delimiter' '
git reflog exists --end-of-options refs/heads/main &&
test_must_fail git reflog exists --end-of-options refs/heads/nonexistent
'
test_done test_done