diff options
Diffstat (limited to 'protocol.c')
| -rw-r--r-- | protocol.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/protocol.c b/protocol.c index 9741f05750..8d964fc65e 100644 --- a/protocol.c +++ b/protocol.c @@ -17,30 +17,33 @@ static enum protocol_version parse_protocol_version(const char *value) enum protocol_version get_protocol_version_config(void) { const char *value; - enum protocol_version retval = protocol_v0; + int val; const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION"; - const char *git_test_v = getenv(git_test_k); + 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) die("unknown value for config 'protocol.version': %s", value); - retval = version; + 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); if (env == protocol_unknown_version) die("unknown value for %s: %s", git_test_k, git_test_v); - if (retval < env) - retval = env; + return env; } - return retval; + return protocol_v0; } enum protocol_version determine_protocol_version_server(void) |