From: Junio C Hamano Date: Tue, 16 Jun 2015 21:27:07 +0000 (-0700) Subject: Merge branch 'sb/pack-protocol-mention-smart-http' X-Git-Tag: v2.5.0-rc0~34 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/486b51bc81e486c654ac35554b284816f4a6ae5c?hp=-c Merge branch 'sb/pack-protocol-mention-smart-http' Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol --- 486b51bc81e486c654ac35554b284816f4a6ae5c diff --combined Documentation/technical/pack-protocol.txt index fc09c63b32,554b640e46..4064fc796f --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@@ -1,11 -1,11 +1,11 @@@ Packfile transfer protocols =========================== - Git supports transferring data in packfiles over the ssh://, git:// and + Git supports transferring data in packfiles over the ssh://, git://, http:// and file:// transports. There exist two sets of protocols, one for pushing data from a client to a server and another for fetching data from a - server to a client. All three transports (ssh, git, file) use the same - protocol to transfer data. + server to a client. The three transports (ssh, git, file) use the same + protocol to transfer data. http is documented in http-protocol.txt. The processes invoked in the canonical Git implementation are 'upload-pack' on the server side and 'fetch-pack' on the client side for fetching data; @@@ -465,7 -465,7 +465,7 @@@ contain all the objects that the serve references. ---- - update-request = *shallow ( command-list | push-cert ) [pack-file] + update-request = *shallow ( command-list | push-cert ) [packfile] shallow = PKT-LINE("shallow" SP obj-id LF) @@@ -491,7 -491,7 +491,7 @@@ *PKT-LINE(gpg-signature-lines LF) PKT-LINE("push-cert-end" LF) - pack-file = "PACK" 28*(OCTET) + packfile = "PACK" 28*(OCTET) ---- If the receiving end does not support delete-refs, the sending end MUST @@@ -502,11 -502,11 +502,11 @@@ MUST NOT send a push-cert command. Whe sent, command-list MUST NOT be sent; the commands recorded in the push certificate is used instead. -The pack-file MUST NOT be sent if the only command used is 'delete'. +The packfile MUST NOT be sent if the only command used is 'delete'. -A pack-file MUST be sent if either create or update command is used, +A packfile MUST be sent if either create or update command is used, even if the server already has all the necessary objects. In this -case the client MUST send an empty pack-file. The only time this +case the client MUST send an empty packfile. The only time this is likely to happen is if the client is creating a new branch or a tag that points to an existing obj-id.