mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

remote: convert check_push_refs to take a struct refspec

Browse Source 
Convert 'check_push_refs()' to take a 'struct refspec' as a parameter
instead of an array of 'const char *'.

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:22 -07:00 committed by Junio C Hamano
parent 5c7ec8462d
commit afb1aed403
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
remote.c
View File

@ -1255,24 +1255,20 @@ static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
* but we can catch some errors early before even talking to the
* remote side.
*/
int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
int check_push_refs(struct ref *src, struct refspec *rs)
{
struct refspec refspec = REFSPEC_INIT_PUSH;
int ret = 0;
int i;
refspec_appendn(&refspec, refspec_names, nr_refspec);
for (i = 0; i < rs->nr; i++) {
struct refspec_item *item = &rs->items[i];
for (i = 0; i < refspec.nr; i++) {
struct refspec_item *rs = &refspec.items[i];
if (rs->pattern || rs->matching)
if (item->pattern || item->matching)
continue;
ret |= match_explicit_lhs(src, rs, NULL, NULL);
ret |= match_explicit_lhs(src, item, NULL, NULL);
}
refspec_clear(&refspec);
return ret;
}

2
remote.h
View File

@ -161,7 +161,7 @@ struct ref *ref_remove_duplicates(struct ref *ref_map);
int query_refspecs(struct refspec *rs, struct refspec_item *query);
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, struct refspec *rs);
int match_push_refs(struct ref *src, struct ref **dst,
struct refspec *rs, int flags);
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,

2
transport.c
View File

@ -1090,7 +1090,7 @@ int transport_push(struct transport *transport,
struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
int i;
if (check_push_refs(local_refs, rs->raw_nr, rs->raw) < 0)
if (check_push_refs(local_refs, rs) < 0)
return -1;
for (i = 0; i < rs->nr; i++) {