[PATCH 26/35] remote: convert match_explicit_refs to take a struct refspec
- From
- Brandon Williams <bmwill@google.com>
- Date
- May 14, 2018, 21:56 UTC
- Message-ID
- <20180514215626.164960-27-bmwill@google.com>
- In-Reply-To
- <20180514215626.164960-1-bmwill@google.com>
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> --- remote.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/remote.c b/remote.c index 0879ee587..73d462f24 100644 --- a/remote.c +++ b/remote.c @@ -1082,12 +1082,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; } @@ -1311,7 +1310,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.17.0.441.gb46fe60e1d-goog