remote: convert get_stale_heads to take a struct refspec
Convert 'get_stale_heads()' to take a 'struct refspec' as a parameter instead of a list of 'struct refspec_item'. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
May 16, 2018 at 15:58 UTC
a2ac50cbfd232b5739bafaf6bfdb80c13633b732
4 files changed
+12
-13
builtin/fetch.c
+1
-1
@@ -963,7 +963,7 @@ static int prune_refs(struct refspec *rs, struct ref *ref_map,
963
const char *raw_url)
964
{
965
int url_len, i, result = 0;
966
- struct ref *ref, *stale_refs = get_stale_heads(rs->items, rs->nr, ref_map);
966
+ struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
967
char *url;
968
int summary_width = transport_summary_width(stale_refs);
969
const char *dangling_msg = dry_run
builtin/remote.c
+1
-2
@@ -347,8 +347,7 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
347
else
348
string_list_append(&states->tracked, abbrev_branch(ref->name));
349
}
350
- stale_refs = get_stale_heads(states->remote->fetch.items,
351
- states->remote->fetch.nr, fetch_map);
350
+ stale_refs = get_stale_heads(&states->remote->fetch, fetch_map);
351
for (ref = stale_refs; ref; ref = ref->next) {
352
struct string_list_item *item =
353
string_list_append(&states->stale, abbrev_branch(ref->name));
remote.c
+9
-9
@@ -698,7 +698,9 @@ static int match_name_with_pattern(const char *key, const char *name,
698
return ret;
699
}
700
701
-static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, struct refspec_item *query, struct string_list *results)
701
+static void query_refspecs_multiple(struct refspec *rs,
702
+ struct refspec_item *query,
703
+ struct string_list *results)
704
{
705
int i;
706
int find_src = !query->src;
@@ -706,8 +708,8 @@ static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, st
708
if (find_src && !query->dst)
709
error("query_refspecs_multiple: need either src or dst");
710
709
- for (i = 0; i < ref_count; i++) {
710
- struct refspec_item *refspec = &refs[i];
711
+ for (i = 0; i < rs->nr; i++) {
712
+ struct refspec_item *refspec = &rs->items[i];
713
const char *key = find_src ? refspec->dst : refspec->src;
714
const char *value = find_src ? refspec->src : refspec->dst;
715
const char *needle = find_src ? query->dst : query->src;
@@ -2068,8 +2070,7 @@ struct ref *guess_remote_head(const struct ref *head,
2070
struct stale_heads_info {
2071
struct string_list *ref_names;
2072
struct ref **stale_refs_tail;
2071
- struct refspec_item *refs;
2072
- int ref_count;
2073
+ struct refspec *rs;
2074
};
2075
2076
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
@@ -2082,7 +2083,7 @@ static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2083
memset(&query, 0, sizeof(struct refspec_item));
2084
query.dst = (char *)refname;
2085
2085
- query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
2086
+ query_refspecs_multiple(info->rs, &query, &matches);
2087
if (matches.nr == 0)
2088
goto clean_exit; /* No matches */
2089
@@ -2110,7 +2111,7 @@ clean_exit:
2111
return 0;
2112
}
2113
2113
-struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map)
2114
+struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2115
{
2116
struct ref *ref, *stale_refs = NULL;
2117
struct string_list ref_names = STRING_LIST_INIT_NODUP;
@@ -2118,8 +2119,7 @@ struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref
2119
2120
info.ref_names = &ref_names;
2121
info.stale_refs_tail = &stale_refs;
2121
- info.refs = refs;
2122
- info.ref_count = ref_count;
2122
+ info.rs = rs;
2123
for (ref = fetch_map; ref; ref = ref->next)
2124
string_list_append(&ref_names, ref->name);
2125
string_list_sort(&ref_names);
remote.h
+1
-1
@@ -267,7 +267,7 @@ struct ref *guess_remote_head(const struct ref *head,
267
int all);
268
269
/* Return refs which no longer exist on remote */
270
-struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map);
270
+struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map);
271
272
/*
273
* Compare-and-swap