The sixth batch

[thirdparty/git.git] / protocol.c

diff --git a/protocol.c b/protocol.c
index d390391ebac80a7b9d506c592bbd32b24f9f250f..d1dd3424bbaa56e21950e6b95a56fcde87cd5450 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -17,6 +17,7 @@ static enum protocol_version parse_protocol_version(const char *value)
 enum protocol_version get_protocol_version_config(void)
 {
        const char *value;
+       int val;
        const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION";
        const char *git_test_v;
 
@@ -30,6 +31,9 @@ enum protocol_version get_protocol_version_config(void)
                return version;
        }
 
+       if (!git_config_get_bool("feature.experimental", &val) && val)
+               return protocol_v2;
+
        git_test_v = getenv(git_test_k);
        if (git_test_v && *git_test_v) {
                enum protocol_version env = parse_protocol_version(git_test_v);