diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 23:54:19 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 23:54:19 +0300 |
commit | 0da63da7942ce810126cd54d9f72a46f3d616895 (patch) | |
tree | 19764100be710ae2c250a13b67d0f202efc9078e /protocol.c | |
parent | a14aebeac330e6d58f9628a02521ea780daf0a5b (diff) | |
parent | 684ceae32dae726c6a5c693b257b156926aba8b7 (diff) |
Merge branch 'jn/promote-proto2-to-default'
The transport protocol version 2 becomes the default one.
* jn/promote-proto2-to-default:
fetch: default to protocol version 2
protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
config doc: protocol.version is not experimental
fetch test: use more robust test for filtered objects
Diffstat (limited to 'protocol.c')
-rw-r--r-- | protocol.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/protocol.c b/protocol.c index 9741f05750..803bef5c87 100644 --- a/protocol.c +++ b/protocol.c @@ -17,9 +17,8 @@ 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; 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)) { enum protocol_version version = parse_protocol_version(value); @@ -28,19 +27,19 @@ enum protocol_version get_protocol_version_config(void) die("unknown value for config 'protocol.version': %s", value); - retval = version; + return version; } + 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_v2; } enum protocol_version determine_protocol_version_server(void) |