]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jt/clone-server-option'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:25 +0000 (00:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:25 +0000 (00:37 +0900)
"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

1  2 
t/t5702-protocol-v2.sh
transport.c

Simple merge
diff --cc transport.c
index 365ea574c7b52e0fc4381295eed6650ca5f67a87,77446119da5d5d6ebb3e0431c855c2b6022ba6b0..f1fcd2c4b006dc2ece2019ac91f73a2f42bbf6bd
@@@ -362,9 -372,10 +371,10 @@@ static int fetch_refs_via_pack(struct t
                break;
        case protocol_v1:
        case protocol_v0:
 -              refs = fetch_pack(&args, data->fd, data->conn,
+               die_if_server_options(transport);
 +              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: