diff options
| author | Brandon Williams <bmwill@google.com> | 2018-05-16 15:57:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-18 06:19:42 +0900 |
| commit | 8ca69370c890b52d751402034524da5384c5dd9a (patch) | |
| tree | 8f7707c48a1e3eea01cf3762b484273bf64359e1 /remote.c | |
| parent | 0460f4727793663b34fbf0711f60394de730f833 (diff) | |
| download | git-8ca69370c890b52d751402034524da5384c5dd9a.tar.gz | |
remote: convert match_push_refs to use struct refspec
Convert 'match_push_refs()' to use struct refspec.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.c')
| -rw-r--r-- | remote.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -1312,7 +1312,7 @@ int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names) int match_push_refs(struct ref *src, struct ref **dst, int nr_refspec, const char **refspec, int flags) { - struct refspec_item *rs; + struct refspec rs = REFSPEC_INIT_PUSH; int send_all = flags & MATCH_REFS_ALL; int send_mirror = flags & MATCH_REFS_MIRROR; int send_prune = flags & MATCH_REFS_PRUNE; @@ -1325,8 +1325,8 @@ int match_push_refs(struct ref *src, struct ref **dst, nr_refspec = 1; refspec = default_refspec; } - rs = parse_push_refspec(nr_refspec, (const char **) refspec); - errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec); + refspec_appendn(&rs, refspec, nr_refspec); + errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr); /* pick the remainder */ for (ref = src; ref; ref = ref->next) { @@ -1335,7 +1335,7 @@ int match_push_refs(struct ref *src, struct ref **dst, const struct refspec_item *pat = NULL; char *dst_name; - dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat); + dst_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_SRC, &pat); if (!dst_name) continue; @@ -1384,7 +1384,7 @@ int match_push_refs(struct ref *src, struct ref **dst, /* We're already sending something to this ref. */ continue; - src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL); + src_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_DST, NULL); if (src_name) { if (!src_ref_index.nr) prepare_ref_index(&src_ref_index, src); @@ -1396,6 +1396,9 @@ int match_push_refs(struct ref *src, struct ref **dst, } string_list_clear(&src_ref_index, 0); } + + refspec_clear(&rs); + if (errs) return -1; return 0; |