summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorRonnie Sahlberg <sahlberg@google.com>2015-01-08 03:23:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-08 03:56:43 (GMT)
commit1b70fe5d305462f1dd4b9d6233a2f4cb98e3a581 (patch)
tree19e971b96d9136e7abb9d62c195d9443c94077cb /Documentation/technical
parent68deed298ac4c257cd72d6bee543f651cb10d669 (diff)
downloadgit-1b70fe5d305462f1dd4b9d6233a2f4cb98e3a581.zip
git-1b70fe5d305462f1dd4b9d6233a2f4cb98e3a581.tar.gz
git-1b70fe5d305462f1dd4b9d6233a2f4cb98e3a581.tar.bz2
receive-pack.c: negotiate atomic push support
This adds the atomic protocol option to allow receive-pack to inform the client that it has atomic push capability. This commit makes the functionality introduced in the previous commits go live for the serving side. The changes in documentation reflect the protocol capabilities of the server. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/protocol-capabilities.txt13
1 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
index 6d5424c..4f8a7bf 100644
--- a/Documentation/technical/protocol-capabilities.txt
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -18,8 +18,9 @@ was sent. Server MUST NOT ignore capabilities that client requested
and server advertised. As a consequence of these rules, server MUST
NOT advertise capabilities it does not understand.
-The 'report-status', 'delete-refs', 'quiet', and 'push-cert' capabilities
-are sent and recognized by the receive-pack (push to server) process.
+The 'atomic', 'report-status', 'delete-refs', 'quiet', and 'push-cert'
+capabilities are sent and recognized by the receive-pack (push to server)
+process.
The 'ofs-delta' and 'side-band-64k' capabilities are sent and recognized
by both upload-pack and receive-pack protocols. The 'agent' capability
@@ -244,6 +245,14 @@ respond with the 'quiet' capability to suppress server-side progress
reporting if the local progress reporting is also being suppressed
(e.g., via `push -q`, or if stderr does not go to a tty).
+atomic
+------
+
+If the server sends the 'atomic' capability it is capable of accepting
+atomic pushes. If the pushing client requests this capability, the server
+will update the refs in one atomic transaction. Either all refs are
+updated or none.
+
allow-tip-sha1-in-want
----------------------