transport: convert transport_push to use struct refspec

Convert the logic in 'transport_push()' which calculates a list of
ref-prefixes to use 'struct refspec'.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/transport.c b/transport.c
index 3ad4d37dc0dc19b9038b78d758aee3dbcd20d31c..181db4d4d07500ab97aab1da25e37dd5c422daad 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1111,21 +1111,22 @@ int transport_push(struct transport *transport,
                int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
                int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
                int push_ret, ret, err;
                int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
                int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
                int push_ret, ret, err;

-               struct refspec_item *tmp_rs;
+               struct refspec tmp_rs = REFSPEC_INIT_PUSH;

                struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
                int i;
 
                if (check_push_refs(local_refs, refspec_nr, refspec) < 0)
                        return -1;
 
                struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
                int i;
 
                if (check_push_refs(local_refs, refspec_nr, refspec) < 0)
                        return -1;
 

-               tmp_rs = parse_push_refspec(refspec_nr, refspec);
-               for (i = 0; i < refspec_nr; i++) {
+               refspec_appendn(&tmp_rs, refspec, refspec_nr);
+               for (i = 0; i < tmp_rs.nr; i++) {
+                       const struct refspec_item *item = &tmp_rs.items[i];

                        const char *prefix = NULL;
 
                        const char *prefix = NULL;
 

-                       if (tmp_rs[i].dst)
-                               prefix = tmp_rs[i].dst;
-                       else if (tmp_rs[i].src && !tmp_rs[i].exact_sha1)
-                               prefix = tmp_rs[i].src;
+                       if (item->dst)
+                               prefix = item->dst;
+                       else if (item->src && !item->exact_sha1)
+                               prefix = item->src;

 
                        if (prefix) {
                                const char *glob = strchr(prefix, '*');
 
                        if (prefix) {
                                const char *glob = strchr(prefix, '*');


@@ -1142,7 +1143,7 @@ int transport_push(struct transport *transport,
                                                               &ref_prefixes);
 
                argv_array_clear(&ref_prefixes);
                                                               &ref_prefixes);
 
                argv_array_clear(&ref_prefixes);

-               free_refspec(refspec_nr, tmp_rs);
+               refspec_clear(&tmp_rs);

 
                if (flags & TRANSPORT_PUSH_ALL)
                        match_flags |= MATCH_REFS_ALL;
 
                if (flags & TRANSPORT_PUSH_ALL)
                        match_flags |= MATCH_REFS_ALL;