Browse Source

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 <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 7 years ago committed by Junio C Hamano
parent
commit
7a78a82b6c
  1. 2
      builtin/send-pack.c
  2. 24
      transport.c
  3. 2
      transport.h

2
builtin/send-pack.c

@ -265,8 +265,6 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) @@ -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;

24
transport.c

@ -619,29 +619,6 @@ void transport_print_push_status(const char *dest, struct ref *refs, @@ -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, @@ -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;

2
transport.h

@ -227,8 +227,6 @@ int transport_helper_init(struct transport *transport, const char *name); @@ -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);

Loading…
Cancel
Save