]> git.ipfire.org Git - thirdparty/git.git/commitdiff
protocol-capabilities.txt: clarify "allow-x-sha1-in-want" re SHA-256
authorMartin Ågren <martin.agren@gmail.com>
Sat, 15 Aug 2020 16:06:01 +0000 (18:06 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Aug 2020 17:35:12 +0000 (10:35 -0700)
Two of our capabilities contain "sha1" in their names, but that's
historical. Clarify that object names are still to be given using
whatever object format has been negotiated using the "object-format"
capability.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/technical/protocol-capabilities.txt

index 36ccd14f97ed4631078fbac5cf65940840d3e197..124d716807eb3e90802282782705dd096be99e43 100644 (file)
@@ -324,15 +324,19 @@ allow-tip-sha1-in-want
 ----------------------
 
 If the upload-pack server advertises this capability, fetch-pack may
-send "want" lines with SHA-1s that exist at the server but are not
-advertised by upload-pack.
+send "want" lines with object names that exist at the server but are not
+advertised by upload-pack. For historical reasons, the name of this
+capability contains "sha1". Object names are always given using the
+object format negotiated through the 'object-format' capability.
 
 allow-reachable-sha1-in-want
 ----------------------------
 
 If the upload-pack server advertises this capability, fetch-pack may
-send "want" lines with SHA-1s that exist at the server but are not
-advertised by upload-pack.
+send "want" lines with object names that exist at the server but are not
+advertised by upload-pack. For historical reasons, the name of this
+capability contains "sha1". Object names are always given using the
+object format negotiated through the 'object-format' capability.
 
 push-cert=<nonce>
 -----------------