Merge branch 'jt/transport-no-more-rsync'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 19:16:30 +0000 (11:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 19:16:30 +0000 (11:16 -0800)
Code clean-up.

* jt/transport-no-more-rsync:
transport: remove unused "push" in vtable

1  2 
transport.c
diff --combined transport.c
index 7231d1b1b0632fa9bb71bcc074b143ff34c1a733,8c4fc5477d424afb47ddb3a8823751e992537d39..7cc39b7c0b9c547752924c82038ed0ac226a22bf
@@@ -305,8 -305,8 +305,8 @@@ void transport_update_tracking_ref(stru
                if (ref->deletion) {
                        delete_ref(NULL, rs.dst, NULL, 0);
                } else
 -                      update_ref("update by push", rs.dst,
 -                                      ref->new_oid.hash, NULL, 0, 0);
 +                      update_ref("update by push", rs.dst, &ref->new_oid,
 +                                 NULL, 0, 0);
                free(rs.dst);
        }
  }
@@@ -627,7 -627,6 +627,6 @@@ void transport_take_over(struct transpo
        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 +968,7 @@@ int transport_push(struct transport *tr
        *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;