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

remote: convert query_refspecs to take a struct refspec

Browse Source 
Convert 'query_refspecs()' 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>
This commit is contained in:
Brandon Williams
2018-05-16 15:58:12 -07:00
committed by Junio C Hamano
parent d000414e26
commit 86baf82521
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/push.c
View File

@ -83,8 +83,7 @@ static const char *map_refspec(const char *ref,
struct refspec_item query; struct refspec_item query;
memset(&query, 0, sizeof(struct refspec_item)); memset(&query, 0, sizeof(struct refspec_item));
query.src = matched->name; query.src = matched->name;
if (!query_refspecs(remote->push.items, remote->push.nr, &query) && if (!query_refspecs(&remote->push, &query) && query.dst) {
query.dst) {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
strbuf_addf(&buf, "%s%s:%s", strbuf_addf(&buf, "%s%s:%s",
query.force ? "+" : "", query.force ? "+" : "",

10
remote.c
View File

@ -725,7 +725,7 @@ static void query_refspecs_multiple(struct refspec *rs,
} }
} }
int query_refspecs(struct refspec_item *refs, int ref_count, struct refspec_item *query) int query_refspecs(struct refspec *rs, struct refspec_item *query)
{ {
int i; int i;
int find_src = !query->src; int find_src = !query->src;
@ -735,8 +735,8 @@ int query_refspecs(struct refspec_item *refs, int ref_count, struct refspec_item
if (find_src && !query->dst) if (find_src && !query->dst)
return error("query_refspecs: need either src or dst"); return error("query_refspecs: need either src or dst");
for (i = 0; i < ref_count; i++) { for (i = 0; i < rs->nr; i++) {
struct refspec_item *refspec = &refs[i]; struct refspec_item *refspec = &rs->items[i];
const char *key = find_src ? refspec->dst : refspec->src; const char *key = find_src ? refspec->dst : refspec->src;
const char *value = find_src ? refspec->src : refspec->dst; const char *value = find_src ? refspec->src : refspec->dst;
@ -763,7 +763,7 @@ char *apply_refspecs(struct refspec *rs, const char *name)
memset(&query, 0, sizeof(struct refspec_item)); memset(&query, 0, sizeof(struct refspec_item));
query.src = (char *)name; query.src = (char *)name;
if (query_refspecs(rs->items, rs->nr, &query)) if (query_refspecs(rs, &query))
return NULL; return NULL;
return query.dst; return query.dst;
@ -771,7 +771,7 @@ char *apply_refspecs(struct refspec *rs, const char *name)
int remote_find_tracking(struct remote *remote, struct refspec_item *refspec) int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
{ {
return query_refspecs(remote->fetch.items, remote->fetch.nr, refspec); return query_refspecs(&remote->fetch, refspec);
} }
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen, static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,

2
remote.h
View File

@ -158,7 +158,7 @@ int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid);
*/ */
struct ref *ref_remove_duplicates(struct ref *ref_map); struct ref *ref_remove_duplicates(struct ref *ref_map);
extern int query_refspecs(struct refspec_item *specs, int nr, struct refspec_item *query); int query_refspecs(struct refspec *rs, struct refspec_item *query);
char *apply_refspecs(struct refspec *rs, const char *name); char *apply_refspecs(struct refspec *rs, const char *name);
int check_push_refs(struct ref *src, int nr_refspec, const char **refspec); int check_push_refs(struct ref *src, int nr_refspec, const char **refspec);