From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Sep 2021 17:56:05 +0000 (-0700)
Subject: Merge branch 'ab/serve-cleanup' into jk/reduce-malloc-in-v2-servers
X-Git-Tag: v2.34.0-rc0~116^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0057847208f5ccec05a0ea62b239e65f3def3a8c;p=thirdparty%2Fgit.git

Merge branch 'ab/serve-cleanup' into jk/reduce-malloc-in-v2-servers

* ab/serve-cleanup:
  upload-pack: document and rename --advertise-refs
  serve.[ch]: remove "serve_options", split up --advertise-refs code
  {upload,receive}-pack tests: add --advertise-refs tests
  serve.c: move version line to advertise_capabilities()
  serve: move transfer.advertiseSID check into session_id_advertise()
  serve.[ch]: don't pass "struct strvec *keys" to commands
  serve: use designated initializers
  transport: use designated initializers
  transport: rename "fetch" in transport_vtable to "fetch_refs"
  serve: mark has_capability() as static
---

0057847208f5ccec05a0ea62b239e65f3def3a8c
diff --cc protocol-caps.c
index 901b6795e4,4b345c5504..bbde91810a
--- a/protocol-caps.c
+++ b/protocol-caps.c
@@@ -69,14 -69,12 +69,13 @@@ static void send_info(struct repositor
  			}
  		}
  
 -		packet_writer_write(writer, "%s",
 -				    strbuf_detach(&send_buffer, NULL));
 +		packet_writer_write(writer, "%s", send_buffer.buf);
 +		strbuf_reset(&send_buffer);
  	}
 +	strbuf_release(&send_buffer);
  }
  
- int cap_object_info(struct repository *r, struct strvec *keys,
- 		    struct packet_reader *request)
+ int cap_object_info(struct repository *r, struct packet_reader *request)
  {
  	struct requested_info info;
  	struct packet_writer writer;