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

refs: add exclude_patterns parameter to for_each_fullref_in()

Browse Source 
The `for_each_fullref_in()` function is supposedly the ref-store-less
equivalent of `refs_for_each_fullref_in()`, but the latter has gained a
new parameter `exclude_patterns` over time. Bring these two functions
back in sync again by adding the parameter to the former function, as
well.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-05-07 09:11:44 +02:00
committed by Junio C Hamano
parent 39a9ef8fc4
commit 54876c6dfb
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/rev-parse.c
View File

@ -908,8 +908,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
continue; continue;
} }
if (!strcmp(arg, "--bisect")) { if (!strcmp(arg, "--bisect")) {
for_each_fullref_in("refs/bisect/bad", show_reference, NULL); for_each_fullref_in("refs/bisect/bad", NULL, show_reference, NULL);
for_each_fullref_in("refs/bisect/good", anti_reference, NULL); for_each_fullref_in("refs/bisect/good", NULL, anti_reference, NULL);
continue; continue;
} }
if (opt_with_value(arg, "--branches", &arg)) { if (opt_with_value(arg, "--branches", &arg)) {

4
builtin/show-ref.c
View File

@ -208,9 +208,9 @@ static int cmd_show_ref__patterns(const struct patterns_options *opts,
head_ref(show_ref, &show_ref_data); head_ref(show_ref, &show_ref_data);
if (opts->heads_only || opts->tags_only) { if (opts->heads_only || opts->tags_only) {
if (opts->heads_only) if (opts->heads_only)
for_each_fullref_in("refs/heads/", show_ref, &show_ref_data); for_each_fullref_in("refs/heads/", NULL, show_ref, &show_ref_data);
if (opts->tags_only) if (opts->tags_only)
for_each_fullref_in("refs/tags/", show_ref, &show_ref_data); for_each_fullref_in("refs/tags/", NULL, show_ref, &show_ref_data);
} else { } else {
for_each_ref(show_ref, &show_ref_data); for_each_ref(show_ref, &show_ref_data);
} }

10
ref-filter.c
View File

@ -2640,7 +2640,7 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,
* prefixes like "refs/heads/" etc. are stripped off, * prefixes like "refs/heads/" etc. are stripped off,
* so we have to look at everything: * so we have to look at everything:
*/ */
return for_each_fullref_in("", cb, cb_data); return for_each_fullref_in("", NULL, cb, cb_data);
} }
if (filter->ignore_case) { if (filter->ignore_case) {
@ -2649,7 +2649,7 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,
* so just return everything and let the caller * so just return everything and let the caller
* sort it out. * sort it out.
*/ */
return for_each_fullref_in("", cb, cb_data); return for_each_fullref_in("", NULL, cb, cb_data);
} }
if (!filter->name_patterns[0]) { if (!filter->name_patterns[0]) {
@ -3060,11 +3060,11 @@ static int do_filter_refs(struct ref_filter *filter, unsigned int type, each_ref
* of filter_ref_kind(). * of filter_ref_kind().
*/ */
if (filter->kind == FILTER_REFS_BRANCHES) if (filter->kind == FILTER_REFS_BRANCHES)
ret = for_each_fullref_in("refs/heads/", fn, cb_data); ret = for_each_fullref_in("refs/heads/", NULL, fn, cb_data);
else if (filter->kind == FILTER_REFS_REMOTES) else if (filter->kind == FILTER_REFS_REMOTES)
ret = for_each_fullref_in("refs/remotes/", fn, cb_data); ret = for_each_fullref_in("refs/remotes/", NULL, fn, cb_data);
else if (filter->kind == FILTER_REFS_TAGS) else if (filter->kind == FILTER_REFS_TAGS)
ret = for_each_fullref_in("refs/tags/", fn, cb_data); ret = for_each_fullref_in("refs/tags/", NULL, fn, cb_data);
else if (filter->kind & FILTER_REFS_REGULAR) else if (filter->kind & FILTER_REFS_REGULAR)
ret = for_each_fullref_in_pattern(filter, fn, cb_data); ret = for_each_fullref_in_pattern(filter, fn, cb_data);

8
refs.c
View File

@ -1742,10 +1742,12 @@ int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
return refs_for_each_ref_in(get_main_ref_store(the_repository), prefix, fn, cb_data); return refs_for_each_ref_in(get_main_ref_store(the_repository), prefix, fn, cb_data);
} }
int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data) int for_each_fullref_in(const char *prefix,
const char **exclude_patterns,
each_ref_fn fn, void *cb_data)
{ {
return do_for_each_ref(get_main_ref_store(the_repository), return refs_for_each_fullref_in(get_main_ref_store(the_repository),
prefix, NULL, fn, 0, 0, cb_data); prefix, exclude_patterns, fn, cb_data);
} }
int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix, int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,

3
refs.h
View File

@ -353,7 +353,8 @@ int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix, int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
const char **exclude_patterns, const char **exclude_patterns,
each_ref_fn fn, void *cb_data); each_ref_fn fn, void *cb_data);
int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data); int for_each_fullref_in(const char *prefix, const char **exclude_patterns,
each_ref_fn fn, void *cb_data);
/** /**
* iterate all refs in "patterns" by partitioning patterns into disjoint sets * iterate all refs in "patterns" by partitioning patterns into disjoint sets