kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/show-ref: refactor options for patterns subcommand 

The patterns subcommand is the last command that still uses global
variables to track its options. Convert it to use a structure instead
with the same motivation as preceding commits.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2023-10-31 09:16:42 +01:00 committed by Junio C Hamano
parent b0f0be9398
commit ee26f1e29a
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
builtin/show-ref.c
View File

@ -18,8 +18,6 @@ static const char * const show_ref_usage[] = {
NULL NULL
}; };


static int show_head, tags_only, heads_only, verify;

struct show_one_options { struct show_one_options {
int quiet; int quiet;
int hash_only; int hash_only;
@ -59,6 +57,7 @@ struct show_ref_data {
const struct show_one_options *show_one_opts; const struct show_one_options *show_one_opts;
const char **patterns; const char **patterns;
int found_match; int found_match;
int show_head;
}; };


static int show_ref(const char *refname, const struct object_id *oid, static int show_ref(const char *refname, const struct object_id *oid,
@ -66,7 +65,7 @@ static int show_ref(const char *refname, const struct object_id *oid,
{ {
struct show_ref_data *data = cbdata; struct show_ref_data *data = cbdata;


if (show_head && !strcmp(refname, "HEAD")) if (data->show_head && !strcmp(refname, "HEAD"))
goto match; goto match;


if (data->patterns) { if (data->patterns) {
@ -184,22 +183,30 @@ static int cmd_show_ref__verify(const struct show_one_options *show_one_opts,
return 0; return 0;
} }


static int cmd_show_ref__patterns(const struct show_one_options *show_one_opts, struct patterns_options {
int show_head;
int heads_only;
int tags_only;
};

static int cmd_show_ref__patterns(const struct patterns_options *opts,
const struct show_one_options *show_one_opts,
const char **patterns) const char **patterns)
{ {
struct show_ref_data show_ref_data = { struct show_ref_data show_ref_data = {
.show_one_opts = show_one_opts, .show_one_opts = show_one_opts,
.show_head = opts->show_head,
}; };


if (patterns && *patterns) if (patterns && *patterns)
show_ref_data.patterns = patterns; show_ref_data.patterns = patterns;


if (show_head) if (opts->show_head)
head_ref(show_ref, &show_ref_data); head_ref(show_ref, &show_ref_data);
if (heads_only || tags_only) { if (opts->heads_only || opts->tags_only) {
if (heads_only) if (opts->heads_only)
for_each_fullref_in("refs/heads/", show_ref, &show_ref_data); for_each_fullref_in("refs/heads/", show_ref, &show_ref_data);
if (tags_only) if (opts->tags_only)
for_each_fullref_in("refs/tags/", show_ref, &show_ref_data); for_each_fullref_in("refs/tags/", show_ref, &show_ref_data);
} else { } else {
for_each_ref(show_ref, &show_ref_data); for_each_ref(show_ref, &show_ref_data);
@ -237,15 +244,17 @@ static int exclude_existing_callback(const struct option *opt, const char *arg,
int cmd_show_ref(int argc, const char **argv, const char *prefix) int cmd_show_ref(int argc, const char **argv, const char *prefix)
{ {
struct exclude_existing_options exclude_existing_opts = {0}; struct exclude_existing_options exclude_existing_opts = {0};
struct patterns_options patterns_opts = {0};
struct show_one_options show_one_opts = {0}; struct show_one_options show_one_opts = {0};
int verify = 0;
const struct option show_ref_options[] = { const struct option show_ref_options[] = {
OPT_BOOL(0, "tags", &tags_only, N_("only show tags (can be combined with heads)")), OPT_BOOL(0, "tags", &patterns_opts.tags_only, N_("only show tags (can be combined with heads)")),
OPT_BOOL(0, "heads", &heads_only, N_("only show heads (can be combined with tags)")), OPT_BOOL(0, "heads", &patterns_opts.heads_only, N_("only show heads (can be combined with tags)")),
OPT_BOOL(0, "verify", &verify, N_("stricter reference checking, " OPT_BOOL(0, "verify", &verify, N_("stricter reference checking, "
"requires exact ref path")), "requires exact ref path")),
OPT_HIDDEN_BOOL('h', NULL, &show_head, OPT_HIDDEN_BOOL('h', NULL, &patterns_opts.show_head,
N_("show the HEAD reference, even if it would be filtered out")), N_("show the HEAD reference, even if it would be filtered out")),
OPT_BOOL(0, "head", &show_head, OPT_BOOL(0, "head", &patterns_opts.show_head,
N_("show the HEAD reference, even if it would be filtered out")), N_("show the HEAD reference, even if it would be filtered out")),
OPT_BOOL('d', "dereference", &show_one_opts.deref_tags, OPT_BOOL('d', "dereference", &show_one_opts.deref_tags,
N_("dereference tags into object IDs")), N_("dereference tags into object IDs")),
@ -271,5 +280,5 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
else if (verify) else if (verify)
return cmd_show_ref__verify(&show_one_opts, argv); return cmd_show_ref__verify(&show_one_opts, argv);
else else
return cmd_show_ref__patterns(&show_one_opts, argv); return cmd_show_ref__patterns(&patterns_opts, &show_one_opts, argv);
} }