mirror of
https://github.com/git/git.git
synced 2024-05-05 14:06:15 +02:00
ref-filter: drop broken-ref code entirely
Now that none of our callers passes the INCLUDE_BROKEN flag, we can drop it entirely, along with the code to plumb it through to the for_each_fullref_in() functions. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1763334caf
commit
2d653c5036
11
ref-filter.c
11
ref-filter.c
|
@ -2405,13 +2405,10 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
|
||||||
{
|
{
|
||||||
struct ref_filter_cbdata ref_cbdata;
|
struct ref_filter_cbdata ref_cbdata;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
unsigned int broken = 0;
|
|
||||||
|
|
||||||
ref_cbdata.array = array;
|
ref_cbdata.array = array;
|
||||||
ref_cbdata.filter = filter;
|
ref_cbdata.filter = filter;
|
||||||
|
|
||||||
if (type & FILTER_REFS_INCLUDE_BROKEN)
|
|
||||||
broken = 1;
|
|
||||||
filter->kind = type & FILTER_REFS_KIND_MASK;
|
filter->kind = type & FILTER_REFS_KIND_MASK;
|
||||||
|
|
||||||
init_contains_cache(&ref_cbdata.contains_cache);
|
init_contains_cache(&ref_cbdata.contains_cache);
|
||||||
|
@ -2428,13 +2425,13 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
|
||||||
* 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/", ref_filter_handler, &ref_cbdata, broken);
|
ret = for_each_fullref_in("refs/heads/", ref_filter_handler, &ref_cbdata, 0);
|
||||||
else if (filter->kind == FILTER_REFS_REMOTES)
|
else if (filter->kind == FILTER_REFS_REMOTES)
|
||||||
ret = for_each_fullref_in("refs/remotes/", ref_filter_handler, &ref_cbdata, broken);
|
ret = for_each_fullref_in("refs/remotes/", ref_filter_handler, &ref_cbdata, 0);
|
||||||
else if (filter->kind == FILTER_REFS_TAGS)
|
else if (filter->kind == FILTER_REFS_TAGS)
|
||||||
ret = for_each_fullref_in("refs/tags/", ref_filter_handler, &ref_cbdata, broken);
|
ret = for_each_fullref_in("refs/tags/", ref_filter_handler, &ref_cbdata, 0);
|
||||||
else if (filter->kind & FILTER_REFS_ALL)
|
else if (filter->kind & FILTER_REFS_ALL)
|
||||||
ret = for_each_fullref_in_pattern(filter, ref_filter_handler, &ref_cbdata, broken);
|
ret = for_each_fullref_in_pattern(filter, ref_filter_handler, &ref_cbdata, 0);
|
||||||
if (!ret && (filter->kind & FILTER_REFS_DETACHED_HEAD))
|
if (!ret && (filter->kind & FILTER_REFS_DETACHED_HEAD))
|
||||||
head_ref(ref_filter_handler, &ref_cbdata);
|
head_ref(ref_filter_handler, &ref_cbdata);
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#define QUOTE_PYTHON 4
|
#define QUOTE_PYTHON 4
|
||||||
#define QUOTE_TCL 8
|
#define QUOTE_TCL 8
|
||||||
|
|
||||||
#define FILTER_REFS_INCLUDE_BROKEN 0x0001
|
|
||||||
#define FILTER_REFS_TAGS 0x0002
|
#define FILTER_REFS_TAGS 0x0002
|
||||||
#define FILTER_REFS_BRANCHES 0x0004
|
#define FILTER_REFS_BRANCHES 0x0004
|
||||||
#define FILTER_REFS_REMOTES 0x0008
|
#define FILTER_REFS_REMOTES 0x0008
|
||||||
|
|
Loading…
Reference in New Issue