diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-07-10 00:00:44 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-07-10 00:00:44 +0300 |
commit | 9850823f06246a235607afd295b1f9381124890e (patch) | |
tree | 035b4ab6844de26ca6f0057b3689e5b6b560e27d | |
parent | 24ecfdf206ee0e9e01f86d333d90d281fdfd12d0 (diff) | |
parent | b5651a2092c112140b6ab330bc6e146b8dabfca2 (diff) |
Merge branch 'jn/eject-fetch-write-commit-graph-out-of-experimental' into master
"fetch.writeCommitGraph" was enabled when "feature.experimental" is
asked for, but it was found to be a bit too risky even for bold
folks in its current shape. The configuration has been ejected, at
least for now, from the "experimental" feature set.
* jn/eject-fetch-write-commit-graph-out-of-experimental:
experimental: default to fetch.writeCommitGraph=false
-rw-r--r-- | Documentation/config/feature.txt | 8 | ||||
-rw-r--r-- | Documentation/config/fetch.txt | 3 | ||||
-rw-r--r-- | repo-settings.c | 8 |
3 files changed, 5 insertions, 14 deletions
diff --git a/Documentation/config/feature.txt b/Documentation/config/feature.txt index 28c33602d5..c0cbf2bb1c 100644 --- a/Documentation/config/feature.txt +++ b/Documentation/config/feature.txt @@ -15,14 +15,6 @@ feature.experimental:: * `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by skipping more commits at a time, reducing the number of round trips. + -* `fetch.writeCommitGraph=true` writes a commit-graph after every `git fetch` -command that downloads a pack-file from a remote. Using the `--split` option, -most executions will create a very small commit-graph file on top of the -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. diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt index b1a9b1461d..b20394038d 100644 --- a/Documentation/config/fetch.txt +++ b/Documentation/config/fetch.txt @@ -90,5 +90,4 @@ fetch.writeCommitGraph:: the 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`. Defaults to false, unless - `feature.experimental` is true. + `git push -f`, and `git log --graph`. Defaults to false. diff --git a/repo-settings.c b/repo-settings.c index dc6817daa9..0918408b34 100644 --- a/repo-settings.c +++ b/repo-settings.c @@ -51,14 +51,14 @@ void prepare_repo_settings(struct repository *r) UPDATE_DEFAULT_BOOL(r->settings.index_version, 4); UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE); } + if (!repo_config_get_bool(r, "fetch.writecommitgraph", &value)) r->settings.fetch_write_commit_graph = value; - if (!repo_config_get_bool(r, "feature.experimental", &value) && value) { - UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING); - UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 1); - } UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0); + if (!repo_config_get_bool(r, "feature.experimental", &value) && value) + UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING); + /* Hack for test programs like test-dump-untracked-cache */ if (ignore_untracked_cache_config) r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP; |