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>

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 85d4faf76c3a53cafd9cc6955877ba7ff10188fe..b2374ddbbf58bb077423c32885a051c3405f6485 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -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)) {
                           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);
        case protocol_v1:
        case protocol_v0:
                get_remote_heads(&reader, &ref, 0, NULL, &shallow);

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index b7ce7c7f5275febbf6db6b71e3b610b09a4fe191..3656e94fdb79da622dad773e0681a7438ce25504 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -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()) {
                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,
        case protocol_v1:
                /*
                 * v1 is just the original protocol with a version string,

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 83cb125a685ec7dca267146567ecfcd0265a2295..b5427f75e34901ad8fa876cc6c53066211e4a2a0 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -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)) {
                           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,
        case protocol_v1:
        case protocol_v0:
                get_remote_heads(&reader, &remote_refs, REF_NORMAL,

diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index 2cb5cb35b06d9946ea7c5b3043249736b260737d..8d53e9794b17451f9dd0ad13eab6b294736cde69 100644 (file)
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -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()) {
                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,
        case protocol_v1:
                /*
                 * v1 is just the original protocol with a version string,

diff --git a/connect.c b/connect.c
index 0b111e62d760bcf0d3948240de489a2249f7cffa..4b89b984c4c55f231801930c998afbd49ca8efe8 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -83,6 +83,9 @@ enum protocol_version discover_version(struct packet_reader *reader)
        }
 
        switch (version) {
        }
 
        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);
        case protocol_v1:
                /* Read the peeked version line */
                packet_reader_read(reader);

diff --git a/protocol.c b/protocol.c
index 43012b7eb6e18bc48d93e6b96a3f3f57fe8ef79f..5e636785d14f8ef5283561d4606fface080bf3c0 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -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;
                return protocol_v0;
        else if (!strcmp(value, "1"))
                return protocol_v1;

+       else if (!strcmp(value, "2"))
+               return protocol_v2;

        else
                return protocol_unknown_version;
 }
        else
                return protocol_unknown_version;
 }

diff --git a/protocol.h b/protocol.h
index 1b2bc94a8d9f3c008bb76a0dfcdd640f99756fe3..2ad35e433c1e6f5f0d08c9d7500dc35782429f51 100644 (file)
--- a/protocol.h
+++ b/protocol.h
@@ -5,6 +5,7 @@ enum protocol_version {
        protocol_unknown_version = -1,
        protocol_v0 = 0,
        protocol_v1 = 1,
        protocol_unknown_version = -1,
        protocol_v0 = 0,
        protocol_v1 = 1,

+       protocol_v2 = 2,

 };
 
 /*
 };
 
 /*

diff --git a/remote-curl.c b/remote-curl.c
index 9f6d07683d0bb6ec5bf1cc8ca293d701c4e9f916..dae8a4a48dc65c7449e274c12872df8b3d236605 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -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)) {
                           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,
        case protocol_v1:
        case protocol_v0:
                get_remote_heads(&reader, &list, for_push ? REF_NORMAL : 0,

diff --git a/transport.c b/transport.c
index 2378dcb38c0334936f013199563851a60ec9a2d8..83d9dd1df6b6bfe4070910e2707bf00fb2f5e8ba 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -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) {
 
        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,
        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) {
                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,
        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) {
                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,
        case protocol_v1:
        case protocol_v0:
                ret = send_pack(&args, data->fd, data->conn, remote_refs,