Merge branch 'rs/name-rev-memsave'

[thirdparty/git.git] / protocol.c

diff --git a/protocol.c b/protocol.c
index 9741f057505d2041be1e8dbd49b444aaeab4bd82..803bef5c87e00617537d3ef1fa04204b7350afb4 100644 (file)
--- 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)