protocol: introduce enum protocol_version value protocol_v2
Introduce protocol_v2, a new value for 'enum protocol_version'. Subsequent patches will fill in the implementation of protocol_v2. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
Mar 14, 2018 at 11:31 UTC
8f6982b4e16c60bba713a3b6592b2ff5c7476974
9 files changed
+36
builtin/fetch-pack.c
+2
@@ -201,6 +201,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
201
PACKET_READ_GENTLE_ON_EOF);
202
203
switch (discover_version(&reader)) {
204
+ case protocol_v2:
205
+ die("support for protocol v2 not implemented yet");
206
case protocol_v1:
207
case protocol_v0:
208
get_remote_heads(&reader, &ref, 0, NULL, &shallow);
builtin/receive-pack.c
+6
@@ -1963,6 +1963,12 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
1963
unpack_limit = receive_unpack_limit;
1964
1965
switch (determine_protocol_version_server()) {
1966
+ case protocol_v2:
1967
+ /*
1968
+ * push support for protocol v2 has not been implemented yet,
1969
+ * so ignore the request to use v2 and fallback to using v0.
1970
+ */
1971
+ break;
1972
case protocol_v1:
1973
/*
1974
* v1 is just the original protocol with a version string,
builtin/send-pack.c
+3
@@ -263,6 +263,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
263
PACKET_READ_GENTLE_ON_EOF);
264
265
switch (discover_version(&reader)) {
266
+ case protocol_v2:
267
+ die("support for protocol v2 not implemented yet");
268
+ break;
269
case protocol_v1:
270
case protocol_v0:
271
get_remote_heads(&reader, &remote_refs, REF_NORMAL,
builtin/upload-pack.c
+7
@@ -47,6 +47,13 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
47
die("'%s' does not appear to be a git repository", dir);
48
49
switch (determine_protocol_version_server()) {
50
+ case protocol_v2:
51
+ /*
52
+ * fetch support for protocol v2 has not been implemented yet,
53
+ * so ignore the request to use v2 and fallback to using v0.
54
+ */
55
+ upload_pack(&opts);
56
+ break;
57
case protocol_v1:
58
/*
59
* v1 is just the original protocol with a version string,
connect.c
+3
@@ -83,6 +83,9 @@ enum protocol_version discover_version(struct packet_reader *reader)
83
}
84
85
switch (version) {
86
+ case protocol_v2:
87
+ die("support for protocol v2 not implemented yet");
88
+ break;
89
case protocol_v1:
90
/* Read the peeked version line */
91
packet_reader_read(reader);
protocol.c
+2
@@ -8,6 +8,8 @@ static enum protocol_version parse_protocol_version(const char *value)
8
return protocol_v0;
9
else if (!strcmp(value, "1"))
10
return protocol_v1;
11
+ else if (!strcmp(value, "2"))
12
+ return protocol_v2;
13
else
14
return protocol_unknown_version;
15
}
protocol.h
+1
@@ -5,6 +5,7 @@ enum protocol_version {
5
protocol_unknown_version = -1,
6
protocol_v0 = 0,
7
protocol_v1 = 1,
8
+ protocol_v2 = 2,
9
};
10
11
/*
remote-curl.c
+3
@@ -185,6 +185,9 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push)
185
PACKET_READ_GENTLE_ON_EOF);
186
187
switch (discover_version(&reader)) {
188
+ case protocol_v2:
189
+ die("support for protocol v2 not implemented yet");
190
+ break;
191
case protocol_v1:
192
case protocol_v0:
193
get_remote_heads(&reader, &list, for_push ? REF_NORMAL : 0,
transport.c
+9
@@ -203,6 +203,9 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
203
204
data->version = discover_version(&reader);
205
switch (data->version) {
206
+ case protocol_v2:
207
+ die("support for protocol v2 not implemented yet");
208
+ break;
209
case protocol_v1:
210
case protocol_v0:
211
get_remote_heads(&reader, &refs,
@@ -250,6 +253,9 @@ static int fetch_refs_via_pack(struct transport *transport,
253
refs_tmp = get_refs_via_connect(transport, 0);
254
255
switch (data->version) {
256
+ case protocol_v2:
257
+ die("support for protocol v2 not implemented yet");
258
+ break;
259
case protocol_v1:
260
case protocol_v0:
261
refs = fetch_pack(&args, data->fd, data->conn,
@@ -585,6 +591,9 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
591
args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
592
593
switch (data->version) {
594
+ case protocol_v2:
595
+ die("support for protocol v2 not implemented yet");
596
+ break;
597
case protocol_v1:
598
case protocol_v0:
599
ret = send_pack(&args, data->fd, data->conn, remote_refs,