transport: convert transport_push to take a struct refspec

Convert 'transport_push()' to take a 'struct refspec' as a
parameter instead of an array of strings which represent
refspecs.

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

diff --git a/builtin/push.c b/builtin/push.c
index ef42979d1e399007fbaf74c1972a21931200a4b1..9cd8e8cd5631158e0904826567f2d3c02bca2bda 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -355,8 +355,7 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
 
        if (verbosity > 0)
                fprintf(stderr, _("Pushing to %s\n"), transport->url);
-       err = transport_push(transport, rs->raw_nr, rs->raw, flags,
-                            &reject_reasons);
+       err = transport_push(transport, rs, flags, &reject_reasons);
        if (err != 0) {
                fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR));
                error(_("failed to push some refs to '%s'"), transport->url);

diff --git a/transport.c b/transport.c
index 181db4d4d07500ab97aab1da25e37dd5c422daad..a89f17744ffd2c58b2b2907fc5fbf77743573632 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1093,11 +1093,11 @@ static int run_pre_push_hook(struct transport *transport,
 }
 
 int transport_push(struct transport *transport,
-                  int refspec_nr, const char **refspec, int flags,
+                  struct refspec *rs, int flags,
                   unsigned int *reject_reasons)
 {
        *reject_reasons = 0;
-       transport_verify_remote_names(refspec_nr, refspec);
+       transport_verify_remote_names(rs->raw_nr, rs->raw);
 
        if (transport_color_config() < 0)
                return -1;
@@ -1111,16 +1111,14 @@ int transport_push(struct transport *transport,
                int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
                int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
                int push_ret, ret, err;
-               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)
+               if (check_push_refs(local_refs, rs->raw_nr, rs->raw) < 0)
                        return -1;
 
-               refspec_appendn(&tmp_rs, refspec, refspec_nr);
-               for (i = 0; i < tmp_rs.nr; i++) {
-                       const struct refspec_item *item = &tmp_rs.items[i];
+               for (i = 0; i < rs->nr; i++) {
+                       const struct refspec_item *item = &rs->items[i];
                        const char *prefix = NULL;
 
                        if (item->dst)
@@ -1143,7 +1141,6 @@ int transport_push(struct transport *transport,
                                                               &ref_prefixes);
 
                argv_array_clear(&ref_prefixes);
-               refspec_clear(&tmp_rs);
 
                if (flags & TRANSPORT_PUSH_ALL)
                        match_flags |= MATCH_REFS_ALL;
@@ -1155,7 +1152,7 @@ int transport_push(struct transport *transport,
                        match_flags |= MATCH_REFS_FOLLOW_TAGS;
 
                if (match_push_refs(local_refs, &remote_refs,
-                                   refspec_nr, refspec, match_flags)) {
+                                   rs->raw_nr, rs->raw, match_flags)) {
                        return -1;
                }
 
@@ -1186,7 +1183,7 @@ int transport_push(struct transport *transport,
 
                        if (!push_unpushed_submodules(&commits,
                                                      transport->remote,
-                                                     refspec, refspec_nr,
+                                                     rs->raw, rs->raw_nr,
                                                      transport->push_options,
                                                      pretend)) {
                                oid_array_clear(&commits);

diff --git a/transport.h b/transport.h
index e783cfa07536b5202eaa697e31a765c1847f1dbf..e2c809af4d96fc94b1e47cbcd0ef36d6b07a18b8 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -197,7 +197,7 @@ void transport_set_verbosity(struct transport *transport, int verbosity,
 #define REJECT_NEEDS_FORCE     0x10
 
 int transport_push(struct transport *connection,
-                  int refspec_nr, const char **refspec, int flags,
+                  struct refspec *rs, int flags,
                   unsigned int * reject_reasons);
 
 /*