Merge branch 'jt/clone-server-option'

gitster · gitster · commit 0e5387cd0248 · 2019-05-30T10:50:46.000-07:00
A brown-paper-bag bugfix to a change already in 'master'.

* jt/clone-server-option:
  fetch-pack: send server options after command
diff --git a/fetch-pack.c b/fetch-pack.c
@@ -1115,7 +1115,7 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
 	    server_supports_v2("server-option", 1)) {
 		int i;
 		for (i = 0; i < args->server_options->nr; i++)
-			packet_write_fmt(fd_out, "server-option=%s",
+			packet_buf_write(&req_buf, "server-option=%s",
 					 args->server_options->items[i].string);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,7 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,`
`1115`	`1115`	`server_supports_v2("server-option", 1)) {`
`1116`	`1116`	`int i;`
`1117`	`1117`	`for (i = 0; i < args->server_options->nr; i++)`
`1118`		`- packet_write_fmt(fd_out, "server-option=%s",`
	`1118`	`+ packet_buf_write(&req_buf, "server-option=%s",`
`1119`	`1119`	`args->server_options->items[i].string);`
`1120`	`1120`	`}`
`1121`	`1121`