From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Dec 2017 19:16:30 +0000 (-0800)
Subject: Merge branch 'jt/transport-no-more-rsync'
X-Git-Tag: v2.16.0-rc0~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d22114ac24fb74486e8ac85ae97ddaa26ad598c2?ds=inline;hp=-c

Merge branch 'jt/transport-no-more-rsync'

Code clean-up.

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

d22114ac24fb74486e8ac85ae97ddaa26ad598c2
diff --combined transport.c
index 7231d1b1b0,8c4fc5477d..7cc39b7c0b
--- a/transport.c
+++ b/transport.c
@@@ -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;