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

diff --cc ls-refs.c
Simple merge

diff --cc protocol-caps.c
index 901b6795e42d055764146b44b37f611841e1ae4a,4b345c55046b6395f923d5739958bf0d1bf6c2ce..bbde91810ac6667a1ee624d112ad26cf23776b1e
--- 1/protocol-caps.c
--- 2/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;

diff --cc upload-pack.c
Simple merge