kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

remote: convert match_explicit_refs to take a struct refspec 

Convert 'match_explicit_refs()' 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>
maint
Brandon Williams 2018-05-16 15:58:14 -07:00 committed by Junio C Hamano
parent f3acb8309f
commit 9fa2e5e853
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
remote.c
View File

@ -1073,12 +1073,11 @@ static int match_explicit(struct ref *src, struct ref *dst,
} }


static int match_explicit_refs(struct ref *src, struct ref *dst, static int match_explicit_refs(struct ref *src, struct ref *dst,
struct ref ***dst_tail, struct refspec_item *rs, struct ref ***dst_tail, struct refspec *rs)
int rs_nr)
{ {
int i, errs; int i, errs;
for (i = errs = 0; i < rs_nr; i++) for (i = errs = 0; i < rs->nr; i++)
errs += match_explicit(src, dst, dst_tail, &rs[i]); errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
return errs; return errs;
} }


@ -1302,7 +1301,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
refspec = default_refspec; refspec = default_refspec;
} }
refspec_appendn(&rs, refspec, nr_refspec); refspec_appendn(&rs, refspec, nr_refspec);
errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr); errs = match_explicit_refs(src, *dst, &dst_tail, &rs);


/* pick the remainder */ /* pick the remainder */
for (ref = src; ref; ref = ref->next) { for (ref = src; ref; ref = ref->next) {