diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:15 +0900 |
| commit | 41267e96972d5a158298f777caecd7433a1b1a94 (patch) | |
| tree | c2203a195e741d750bfb5d65057f1fe06d140b00 /transport.c | |
| parent | 30b015bffe21a127d4f349f9e876562c3c94a1a2 (diff) | |
| parent | 5e3548ef161d4d284e35cf5f5d6a181ba4fe707b (diff) | |
| download | git-41267e96972d5a158298f777caecd7433a1b1a94.tar.gz | |
Merge branch 'bw/server-options'
The transport protocol v2 is getting updated further.
* bw/server-options:
fetch: send server options when using protocol v2
ls-remote: send server options when using protocol v2
serve: introduce the server-option capability
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 37410d8aad..2c4de32b33 100644 --- a/transport.c +++ b/transport.c @@ -268,7 +268,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus switch (data->version) { case protocol_v2: get_remote_refs(data->fd[1], &reader, &refs, for_push, - ref_prefixes); + ref_prefixes, transport->server_options); break; case protocol_v1: case protocol_v0: @@ -316,6 +316,7 @@ static int fetch_refs_via_pack(struct transport *transport, args.no_dependents = data->options.no_dependents; args.filter_options = data->options.filter_options; args.stateless_rpc = transport->stateless_rpc; + args.server_options = transport->server_options; if (!data->got_remote_heads) refs_tmp = get_refs_via_connect(transport, 0, NULL); |