diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 17:23:44 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 17:23:44 (GMT) |
commit | 4c6dad0059b2b5d1ea996ccf67f93224955b07b4 (patch) | |
tree | c873cad90875dc679c722beac0abe4ddae5d25cb /builtin | |
parent | f65ab574441f6ed9e59e50be68480bd698d9c749 (diff) | |
parent | 6464679d9620d91b639e2681b9cc6473f3856d09 (diff) | |
download | git-4c6dad0059b2b5d1ea996ccf67f93224955b07b4.zip git-4c6dad0059b2b5d1ea996ccf67f93224955b07b4.tar.gz git-4c6dad0059b2b5d1ea996ccf67f93224955b07b4.tar.bz2 |
Merge branch 'bw/protocol-v1'
A new mechanism to upgrade the wire protocol in place is proposed
and demonstrated that it works with the older versions of Git
without harming them.
* bw/protocol-v1:
Documentation: document Extra Parameters
ssh: introduce a 'simple' ssh variant
i5700: add interop test for protocol transition
http: tell server that the client understands v1
connect: tell server that the client understands v1
connect: teach client to recognize v1 server response
upload-pack, receive-pack: introduce protocol version 1
daemon: recognize hidden request arguments
protocol: introduce protocol extension mechanisms
pkt-line: add packet_write function
connect: in ref advertisement, shallows are last
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/receive-pack.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 4d37a16..b7ce7c7 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -24,6 +24,7 @@ #include "tmp-objdir.h" #include "oidset.h" #include "packfile.h" +#include "protocol.h" static const char * const receive_pack_usage[] = { N_("git receive-pack <git-dir>"), @@ -1961,6 +1962,22 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) else if (0 <= receive_unpack_limit) unpack_limit = receive_unpack_limit; + switch (determine_protocol_version_server()) { + case protocol_v1: + /* + * v1 is just the original protocol with a version string, + * so just fall through after writing the version string. + */ + if (advertise_refs || !stateless_rpc) + packet_write_fmt(1, "version 1\n"); + + /* fallthrough */ + case protocol_v0: + break; + case protocol_unknown_version: + BUG("unknown protocol version"); + } + if (advertise_refs || !stateless_rpc) { write_head_info(); } |