diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-08 14:02:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-08 14:04:41 -0400 |
| commit | 7466500782b89ea4d1aa038b8243268e8e261821 (patch) | |
| tree | 85520e237c97f6974ea548f99315e3b04ef8f139 /doc | |
| parent | 722c13fa8543dd0e1d086b276cb67c872c3f97fe (diff) | |
hooked up XMPP git push send/receive (but not yet control flow)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/design/assistant/xmpp.mdwn | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn index dafa709db..a7370382e 100644 --- a/doc/design/assistant/xmpp.mdwn +++ b/doc/design/assistant/xmpp.mdwn @@ -58,11 +58,11 @@ For pairing, a chat message is sent, containing: To request that a peer push to us, a chat message can be sent: - <git-annex xmlns='git-annex' pushrequest="" /> + <git-annex xmlns='git-annex' pushrequest="uuid" /> When a peer is ready to send a git push, it sends: - <git-annex xmlns='git-annex' startingpush="" /> + <git-annex xmlns='git-annex' startingpush="uuid" /> The receiver runs `git receive-pack`, and sends back its output in one or more chat messages: @@ -71,7 +71,8 @@ one or more chat messages: 007b27ca394d26a05d9b6beefa1b07da456caa2157d7 refs/heads/git-annex report-status delete-refs side-band-64k quiet ofs-delta </git-annex> -The sender replies with the data from `git push`: +The sender replies with the data from `git push` (which does not need +to actually be started until this point): <git-annex xmlns='git-annex' sp=""> data |