diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:20 -0700 |
| commit | e76ae330099f97d3a868cacf311f420203f51a67 (patch) | |
| tree | 2a8a44264a0c409053d3459c59c8cdd44502361a /protocol.c | |
| parent | b28919c7bcfabad81896070e6b7b66be8310e6a8 (diff) | |
| parent | eb049759fb6b739310af52ee0e13ce6cd0c86be7 (diff) | |
| download | git-e76ae330099f97d3a868cacf311f420203f51a67.tar.xz | |
Merge branch 'jk/make-protocol-v2-the-default'
The transport protocol v2 has become the default again.
* jk/make-protocol-v2-the-default:
protocol: re-enable v2 protocol by default
Diffstat (limited to 'protocol.c')
| -rw-r--r-- | protocol.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/protocol.c b/protocol.c index 8d964fc65e..052d7edbb9 100644 --- a/protocol.c +++ b/protocol.c @@ -17,7 +17,6 @@ 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; @@ -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) |