From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Sep 2021 20:44:47 +0000 (-0700)
Subject: Merge branch 'jk/http-server-protocol-versions'
X-Git-Tag: v2.34.0-rc0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cabb41d0f6c93077229502e7c2d57397808393c8;p=thirdparty%2Fgit.git

Merge branch 'jk/http-server-protocol-versions'

Taking advantage of the CGI interface, http-backend has been
updated to enable protocol v2 automatically when the other side
asks for it.

* jk/http-server-protocol-versions:
  docs/protocol-v2: point readers transport config discussion
  docs/git: discuss server-side config for GIT_PROTOCOL
  docs/http-backend: mention v2 protocol
  http-backend: handle HTTP_GIT_PROTOCOL CGI variable
  t5551: test v2-to-v0 http protocol fallback
---

cabb41d0f6c93077229502e7c2d57397808393c8
diff --cc Documentation/technical/protocol-v2.txt
index 213538f1d0,a703d37e08..59b86fcf97
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@@ -81,9 -84,9 +84,12 @@@ A v2 server would reply
  Subsequent requests are then made directly to the service
  `$GIT_URL/git-upload-pack`. (This works the same for git-receive-pack).
  
 +Uses the `--http-backend-info-refs` option to
 +linkgit:git-upload-pack[1].
 +
+ The server may need to be configured to pass this header's contents via
+ the `GIT_PROTOCOL` variable. See the discussion in `git-http-backend.txt`.
+ 
  Capability Advertisement
  ------------------------