From 306f22dbc8f43feeed735905276c48a96c63b9e5 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 16 May 2018 15:58:17 -0700 Subject: 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 Signed-off-by: Junio C Hamano --- transport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'transport.h') diff --git a/transport.h b/transport.h index e783cfa075..e2c809af4d 100644 --- 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); /* -- cgit v1.2.3 From 7a78a82b6c3bb2a6ebaddf3354b6d97939bdb2ab Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 16 May 2018 15:58:19 -0700 Subject: transport: remove transport_verify_remote_names Remove 'transprot_verify_remote_names()' because all callers have migrated to using 'struct refspec' which performs the same checks in 'parse_refspec()'. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano --- builtin/send-pack.c | 2 -- transport.c | 24 ------------------------ transport.h | 2 -- 3 files changed, 28 deletions(-) (limited to 'transport.h') diff --git a/builtin/send-pack.c b/builtin/send-pack.c index ef512616f3..7c34bf467e 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -265,8 +265,6 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) BUG("unknown protocol version"); } - transport_verify_remote_names(rs.raw_nr, rs.raw); - local_refs = get_local_heads(); flags = MATCH_REFS_NONE; diff --git a/transport.c b/transport.c index a89f17744f..fe96c0b807 100644 --- a/transport.c +++ b/transport.c @@ -619,29 +619,6 @@ void transport_print_push_status(const char *dest, struct ref *refs, free(head); } -void transport_verify_remote_names(int nr_heads, const char **heads) -{ - int i; - - for (i = 0; i < nr_heads; i++) { - const char *local = heads[i]; - const char *remote = strrchr(heads[i], ':'); - - if (*local == '+') - local++; - - /* A matching refspec is okay. */ - if (remote == local && remote[1] == '\0') - continue; - - remote = remote ? (remote + 1) : local; - if (check_refname_format(remote, - REFNAME_ALLOW_ONELEVEL|REFNAME_REFSPEC_PATTERN)) - die("remote part of refspec is not a valid name in %s", - heads[i]); - } -} - static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) { struct git_transport_data *data = transport->data; @@ -1097,7 +1074,6 @@ int transport_push(struct transport *transport, unsigned int *reject_reasons) { *reject_reasons = 0; - transport_verify_remote_names(rs->raw_nr, rs->raw); if (transport_color_config() < 0) return -1; diff --git a/transport.h b/transport.h index e2c809af4d..bac085ce0e 100644 --- a/transport.h +++ b/transport.h @@ -227,8 +227,6 @@ int transport_helper_init(struct transport *transport, const char *name); int bidirectional_transfer_loop(int input, int output); /* common methods used by transport.c and builtin/send-pack.c */ -void transport_verify_remote_names(int nr_heads, const char **heads); - void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose); int transport_refs_pushed(struct ref *ref); -- cgit v1.2.3