Browse Source

transport: remove unused "push" in vtable

After commit 0d0bac67ce ("transport: drop support for git-over-rsync",
2016-02-01), no transport in Git populates the "push" entry in the
transport vtable. Remove this entry.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Tan 7 years ago committed by Junio C Hamano
parent
commit
170078693f
  1. 9
      transport.c
  2. 1
      transport.h

9
transport.c

@ -627,7 +627,6 @@ void transport_take_over(struct transport *transport,
transport->set_option = NULL; transport->set_option = NULL;
transport->get_refs_list = get_refs_via_connect; transport->get_refs_list = get_refs_via_connect;
transport->fetch = fetch_refs_via_pack; transport->fetch = fetch_refs_via_pack;
transport->push = NULL;
transport->push_refs = git_transport_push; transport->push_refs = git_transport_push;
transport->disconnect = disconnect_git; transport->disconnect = disconnect_git;
transport->smart_options = &(data->options); transport->smart_options = &(data->options);
@ -969,13 +968,7 @@ int transport_push(struct transport *transport,
*reject_reasons = 0; *reject_reasons = 0;
transport_verify_remote_names(refspec_nr, refspec); transport_verify_remote_names(refspec_nr, refspec);


if (transport->push) { if (transport->push_refs) {
/* Maybe FIXME. But no important transport uses this case. */
if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
die("This transport does not support using --set-upstream");

return transport->push(transport, refspec_nr, refspec, flags);
} else if (transport->push_refs) {
struct ref *remote_refs; struct ref *remote_refs;
struct ref *local_refs = get_local_heads(); struct ref *local_refs = get_local_heads();
int match_flags = MATCH_REFS_NONE; int match_flags = MATCH_REFS_NONE;

1
transport.h

@ -103,7 +103,6 @@ struct transport {
* process involved generating new commits. * process involved generating new commits.
**/ **/
int (*push_refs)(struct transport *transport, struct ref *refs, int flags); int (*push_refs)(struct transport *transport, struct ref *refs, int flags);
int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
int (*connect)(struct transport *connection, const char *name, int (*connect)(struct transport *connection, const char *name,
const char *executable, int fd[2]); const char *executable, int fd[2]);



Loading…
Cancel
Save