Git 2.26 used protocol v2 as its default protocol, but soon after release, reports of edge-case regressions started rolling in. So Git 2.27 returned to protocol v0 as a default (but with the various fixes in place to make protocol v2 safe) and Git 2.28 will use protocol v0 as default but enable protocol v2 for those adventurous users that enable experimental features by setting feature.experimental=true. Thus if all goes well, by the time Git 2.29 is being released, we can be confident in protocol v2 as a default again. Make it the default. This especially speeds up fetches from repositories with many refs, such as https://chromium.googlesource.com/chromium/src. Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> --- Mostly sending this to get the discussion started about what changes we want before flipping the default. Are there tests we can run? Should we make the negotiation code more similar? Any other bits we'd want to change? Thanks, Jonathan Documentation/config/feature.txt | 4 ---- Documentation/config/protocol.txt | 3 +-- protocol.c | 6 +----- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Documentation/config/feature.txt b/Documentation/config/feature.txt index 28c33602d52..4e3a5c0cebc 100644 --- a/Documentation/config/feature.txt +++ b/Documentation/config/feature.txt @@ -22,10 +22,6 @@ existing commit-graph file(s). Occasionally, these files will merge and the write may take longer. Having an updated commit-graph file helps performance of many Git commands, including `git merge-base`, `git push -f`, and `git log --graph`. -+ -* `protocol.version=2` speeds up fetches from repositories with many refs by -allowing the client to specify which refs to list before the server lists -them. feature.manyFiles:: Enable config options that optimize for repos with many files in the diff --git a/Documentation/config/protocol.txt b/Documentation/config/protocol.txt index c46e9b3d00a..756591d77b0 100644 --- a/Documentation/config/protocol.txt +++ b/Documentation/config/protocol.txt @@ -48,8 +48,7 @@ protocol.version:: If set, clients will attempt to communicate with a server using the specified protocol version. If the server does not support it, communication falls back to version 0. - If unset, the default is `0`, unless `feature.experimental` - is enabled, in which case the default is `2`. + If unset, the default is `2`. Supported versions: + -- diff --git a/protocol.c b/protocol.c index d1dd3424bba..803bef5c87e 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) -- 2.27.0.383.g050319c2ae
