diff options
| author |  Brandon Williams <bmwill@google.com> | 2018-03-15 10:31:40 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-15 12:01:09 -0700 |
| commit | 237ffedd46098a5b8a303cfbac7ecb0ff3a8a7a7 (patch) | |
| tree | 640381b1d928b27093a4244fd9c1d128de900926 | |
| parent | http: don't always add Git-Protocol header (diff) | |
| download | tgif-237ffedd46098a5b8a303cfbac7ecb0ff3a8a7a7.tar.xz | |
http: eliminate "# service" line when using protocol v2
When an http info/refs request is made, requesting that protocol v2 be
used, don't send a "# service" line since this line is not part of the
v2 spec.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | http-backend.c | 8 | ||||
| -rw-r--r-- | remote-curl.c | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/http-backend.c b/http-backend.c index f3dc218b2a..5d241e9109 100644 --- a/http-backend.c +++ b/http-backend.c @@ -10,6 +10,7 @@ #include "url.h" #include "argv-array.h" #include "packfile.h" +#include "protocol.h" static const char content_type[] = "Content-Type"; static const char content_length[] = "Content-Length"; @@ -466,8 +467,11 @@ static void get_info_refs(struct strbuf *hdr, char *arg) hdr_str(hdr, content_type, buf.buf); end_headers(hdr); - packet_write_fmt(1, "# service=git-%s\n", svc->name); - packet_flush(1); + + if (determine_protocol_version_server() != protocol_v2) { + packet_write_fmt(1, "# service=git-%s\n", svc->name); + packet_flush(1); + } argv[0] = svc->name; run_service(argv, 0); diff --git a/remote-curl.c b/remote-curl.c index b4e9db85bb..66a53f74bb 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -396,6 +396,9 @@ static struct discovery *discover_refs(const char *service, int for_push) ; last->proto_git = 1; + } else if (maybe_smart && + last->len > 5 && starts_with(last->buf + 4, "version 2")) { + last->proto_git = 1; } if (last->proto_git) |