diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:30 -0800 |
| commit | d22114ac24fb74486e8ac85ae97ddaa26ad598c2 (patch) | |
| tree | 23fc783675a1d40a947ae7a27f4e3f87e83c470b | |
| parent | Merge branch 'sg/travis-fixes' (diff) | |
| parent | transport: remove unused "push" in vtable (diff) | |
| download | tgif-d22114ac24fb74486e8ac85ae97ddaa26ad598c2.tar.xz | |
Merge branch 'jt/transport-no-more-rsync'
Code clean-up.
* jt/transport-no-more-rsync:
transport: remove unused "push" in vtable
| -rw-r--r-- | transport.c | 9 | ||||
| -rw-r--r-- | transport.h | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/transport.c b/transport.c index 7231d1b1b0..7cc39b7c0b 100644 --- a/transport.c +++ b/transport.c @@ -627,7 +627,6 @@ void transport_take_over(struct transport *transport, transport->set_option = NULL; transport->get_refs_list = get_refs_via_connect; transport->fetch = fetch_refs_via_pack; - transport->push = NULL; transport->push_refs = git_transport_push; transport->disconnect = disconnect_git; transport->smart_options = &(data->options); @@ -969,13 +968,7 @@ int transport_push(struct transport *transport, *reject_reasons = 0; transport_verify_remote_names(refspec_nr, refspec); - if (transport->push) { - /* 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) { + if (transport->push_refs) { struct ref *remote_refs; struct ref *local_refs = get_local_heads(); int match_flags = MATCH_REFS_NONE; diff --git a/transport.h b/transport.h index bc5571574b..ab4fe7f277 100644 --- a/transport.h +++ b/transport.h @@ -103,7 +103,6 @@ struct transport { * process involved generating new commits. **/ 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, const char *executable, int fd[2]); |