Skip to content

Commit d22114a

Browse files
committed
Merge branch 'jt/transport-no-more-rsync'
Code clean-up. * jt/transport-no-more-rsync: transport: remove unused "push" in vtable
2 parents f62b471 + 1700786 commit d22114a

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

transport.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,6 @@ void transport_take_over(struct transport *transport,
627627
transport->set_option = NULL;
628628
transport->get_refs_list = get_refs_via_connect;
629629
transport->fetch = fetch_refs_via_pack;
630-
transport->push = NULL;
631630
transport->push_refs = git_transport_push;
632631
transport->disconnect = disconnect_git;
633632
transport->smart_options = &(data->options);
@@ -969,13 +968,7 @@ int transport_push(struct transport *transport,
969968
*reject_reasons = 0;
970969
transport_verify_remote_names(refspec_nr, refspec);
971970

972-
if (transport->push) {
973-
/* Maybe FIXME. But no important transport uses this case. */
974-
if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
975-
die("This transport does not support using --set-upstream");
976-
977-
return transport->push(transport, refspec_nr, refspec, flags);
978-
} else if (transport->push_refs) {
971+
if (transport->push_refs) {
979972
struct ref *remote_refs;
980973
struct ref *local_refs = get_local_heads();
981974
int match_flags = MATCH_REFS_NONE;

transport.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ struct transport {
103103
* process involved generating new commits.
104104
**/
105105
int (*push_refs)(struct transport *transport, struct ref *refs, int flags);
106-
int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
107106
int (*connect)(struct transport *connection, const char *name,
108107
const char *executable, int fd[2]);
109108

0 commit comments

Comments
 (0)