From 9fa2e5e8534519f07d1a93878fde6341fb012a6e Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 16 May 2018 15:58:14 -0700 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- remote.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/remote.c b/remote.c index 9eb79ea197..84dda3fd08 100644 --- a/remote.c +++ b/remote.c @@ -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, - struct ref ***dst_tail, struct refspec_item *rs, - int rs_nr) + struct ref ***dst_tail, struct refspec *rs) { int i, errs; - for (i = errs = 0; i < rs_nr; i++) - errs += match_explicit(src, dst, dst_tail, &rs[i]); + for (i = errs = 0; i < rs->nr; i++) + errs += match_explicit(src, dst, dst_tail, &rs->items[i]); return errs; } @@ -1302,7 +1301,7 @@ int match_push_refs(struct ref *src, struct ref **dst, refspec = default_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 */ for (ref = src; ref; ref = ref->next) { -- 2.43.2