mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bw/server-options'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2018-05-23 14:38:15 +09:00
parent 30b015bffe 5e3548ef16
commit 41267e9697
14 changed files with 116 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
connect.c
View File

@ -408,7 +408,8 @@ out:
struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
struct ref **list, int for_push,
const struct argv_array *ref_prefixes)
const struct argv_array *ref_prefixes,
const struct string_list *server_options)
{
int i;
*list = NULL;
@ -419,6 +420,12 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
if (server_supports_v2("agent", 0))
packet_write_fmt(fd_out, "agent=%s", git_user_agent_sanitized());
if (server_options && server_options->nr &&
server_supports_v2("server-option", 1))
for (i = 0; i < server_options->nr; i++)
packet_write_fmt(fd_out, "server-option=%s",
server_options->items[i].string);
packet_delim(fd_out);
/* When pushing we don't want to request the peeled tags */
if (!for_push)