From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2019 15:37:25 +0000 (+0900)
Subject: Merge branch 'jt/clone-server-option'
X-Git-Tag: v2.22.0-rc0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d3df8ef01b95539539cd5b22304eff27ea1322b;p=thirdparty%2Fgit.git

Merge branch 'jt/clone-server-option'

"git clone" learned a new --server-option option when talking over
the protocol version 2.

* jt/clone-server-option:
  clone: send server options when using protocol v2
  transport: die if server options are unsupported
---

6d3df8ef01b95539539cd5b22304eff27ea1322b
diff --cc transport.c
index 365ea574c7,77446119da..f1fcd2c4b0
--- a/transport.c
+++ b/transport.c
@@@ -362,9 -372,10 +371,10 @@@ static int fetch_refs_via_pack(struct t
  		break;
  	case protocol_v1:
  	case protocol_v0:
+ 		die_if_server_options(transport);
 -		refs = fetch_pack(&args, data->fd, data->conn,
 +		refs = fetch_pack(&args, data->fd,
  				  refs_tmp ? refs_tmp : transport->remote_refs,
 -				  dest, to_fetch, nr_heads, &data->shallow,
 +				  to_fetch, nr_heads, &data->shallow,
  				  &transport->pack_lockfile, data->version);
  		break;
  	case protocol_unknown_version: