strmap: enable allocations to come from a mem_pool

[thirdparty/git.git] / protocol.c

diff --git a/protocol.c b/protocol.c
index d1dd3424bbaa56e21950e6b95a56fcde87cd5450..052d7edbb9a332c40a4bde7db85bed14564df51c 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -17,11 +17,10 @@ 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;
 
-       if (!git_config_get_string_const("protocol.version", &value)) {
+       if (!git_config_get_string_tmp("protocol.version", &value)) {
                enum protocol_version version = parse_protocol_version(value);
 
                if (version == protocol_unknown_version)
@@ -31,9 +30,6 @@ 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);
@@ -43,7 +39,7 @@ enum protocol_version get_protocol_version_config(void)
                return env;
        }
 
-       return protocol_v0;
+       return protocol_v2;
 }
 
 enum protocol_version determine_protocol_version_server(void)