diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-24 11:24:22 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-24 11:24:22 +0900 |
| commit | bbc39d4020372a0bf8aa399c7550ba58312adfa1 (patch) | |
| tree | cd73306b4e1965ede84e883816b9aac6de42d105 /http-backend.c | |
| parent | fe0a9eaf31dd0c349ae4308498c33a5c3794b293 (diff) | |
| parent | a4d78ce26bf4816d868be21c7355d0e0940460a7 (diff) | |
| download | git-bbc39d4020372a0bf8aa399c7550ba58312adfa1.tar.gz | |
Merge branch 'bw/protocol-v2' into HEAD
* bw/protocol-v2: (35 commits)
remote-curl: don't request v2 when pushing
remote-curl: implement stateless-connect command
http: eliminate "# service" line when using protocol v2
http: don't always add Git-Protocol header
http: allow providing extra headers for http requests
remote-curl: store the protocol version the server responded with
remote-curl: create copy of the service name
pkt-line: add packet_buf_write_len function
transport-helper: introduce stateless-connect
transport-helper: refactor process_connect_service
transport-helper: remove name parameter
connect: don't request v2 when pushing
connect: refactor git_connect to only get the protocol version once
fetch-pack: support shallow requests
fetch-pack: perform a fetch using v2
upload-pack: introduce fetch server command
push: pass ref prefixes when pushing
fetch: pass ref prefixes when fetching
ls-remote: pass ref prefixes when requesting a remote's refs
transport: convert transport_get_remote_refs to take a list of ref prefixes
...
Diffstat (limited to 'http-backend.c')
| -rw-r--r-- | http-backend.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/http-backend.c b/http-backend.c index 88d2a9bc40..bf9b9199e1 100644 --- a/http-backend.c +++ b/http-backend.c @@ -12,6 +12,7 @@ #include "argv-array.h" #include "packfile.h" #include "object-store.h" +#include "protocol.h" static const char content_type[] = "Content-Type"; static const char content_length[] = "Content-Length"; @@ -468,8 +469,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); |