summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-27 19:16:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-27 19:16:30 (GMT)
commitd22114ac24fb74486e8ac85ae97ddaa26ad598c2 (patch)
tree23fc783675a1d40a947ae7a27f4e3f87e83c470b /transport.c
parentf62b471d219ffabcd2adf28d3df5cd5bb9aad851 (diff)
parent170078693fcccd614406e1c3c9fcbea8aaba0c13 (diff)
downloadgit-d22114ac24fb74486e8ac85ae97ddaa26ad598c2.zip
git-d22114ac24fb74486e8ac85ae97ddaa26ad598c2.tar.gz
git-d22114ac24fb74486e8ac85ae97ddaa26ad598c2.tar.bz2
Merge branch 'jt/transport-no-more-rsync'
Code clean-up. * jt/transport-no-more-rsync: transport: remove unused "push" in vtable
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/transport.c b/transport.c
index 7231d1b..7cc39b7 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;