mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-06 22:46:14 +02:00
Code

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>
This commit is contained in:
Brandon Williams 2018-03-14 11:31:47 -07:00 committed by Junio C Hamano
parent 432e956510
commit 8f6982b4e1
9 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/fetch-pack.c
View File

@ -201,6 +201,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
PACKET_READ_GENTLE_ON_EOF);
switch (discover_version(&reader)) {
case protocol_v2:
die("support for protocol v2 not implemented yet");
case protocol_v1:
case protocol_v0:
get_remote_heads(&reader, &ref, 0, NULL, &shallow);

6
builtin/receive-pack.c
View File

@ -1963,6 +1963,12 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
unpack_limit = receive_unpack_limit;
switch (determine_protocol_version_server()) {
case protocol_v2:
/*
* push support for protocol v2 has not been implemented yet,
* so ignore the request to use v2 and fallback to using v0.
*/
break;
case protocol_v1:
/*
* v1 is just the original protocol with a version string,

3
builtin/send-pack.c
View File

@ -263,6 +263,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
PACKET_READ_GENTLE_ON_EOF);
switch (discover_version(&reader)) {
case protocol_v2:
die("support for protocol v2 not implemented yet");
break;
case protocol_v1:
case protocol_v0:
get_remote_heads(&reader, &remote_refs, REF_NORMAL,

7
builtin/upload-pack.c
View File

@ -47,6 +47,13 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
die("'%s' does not appear to be a git repository", dir);
switch (determine_protocol_version_server()) {
case protocol_v2:
/*
* fetch support for protocol v2 has not been implemented yet,
* so ignore the request to use v2 and fallback to using v0.
*/
upload_pack(&opts);
break;
case protocol_v1:
/*
* v1 is just the original protocol with a version string,

3
connect.c
View File

@ -83,6 +83,9 @@ enum protocol_version discover_version(struct packet_reader *reader)
}
switch (version) {
case protocol_v2:
die("support for protocol v2 not implemented yet");
break;
case protocol_v1:
/* Read the peeked version line */
packet_reader_read(reader);

2
protocol.c
View File

@ -8,6 +8,8 @@ static enum protocol_version parse_protocol_version(const char *value)
return protocol_v0;
else if (!strcmp(value, "1"))
return protocol_v1;
else if (!strcmp(value, "2"))
return protocol_v2;
else
return protocol_unknown_version;
}

1
protocol.h
View File

@ -5,6 +5,7 @@ enum protocol_version {
protocol_unknown_version = -1,
protocol_v0 = 0,
protocol_v1 = 1,
protocol_v2 = 2,
};
/*

3
remote-curl.c
View File

@ -185,6 +185,9 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push)
PACKET_READ_GENTLE_ON_EOF);
switch (discover_version(&reader)) {
case protocol_v2:
die("support for protocol v2 not implemented yet");
break;
case protocol_v1:
case protocol_v0:
get_remote_heads(&reader, &list, for_push ? REF_NORMAL : 0,

9
transport.c
View File

@ -203,6 +203,9 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
data->version = discover_version(&reader);
switch (data->version) {
case protocol_v2:
die("support for protocol v2 not implemented yet");
break;
case protocol_v1:
case protocol_v0:
get_remote_heads(&reader, &refs,
@ -250,6 +253,9 @@ static int fetch_refs_via_pack(struct transport *transport,
refs_tmp = get_refs_via_connect(transport, 0);
switch (data->version) {
case protocol_v2:
die("support for protocol v2 not implemented yet");
break;
case protocol_v1:
case protocol_v0:
refs = fetch_pack(&args, data->fd, data->conn,
@ -585,6 +591,9 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
switch (data->version) {
case protocol_v2:
die("support for protocol v2 not implemented yet");
break;
case protocol_v1:
case protocol_v0:
ret = send_pack(&args, data->fd, data->conn, remote_refs,