Skip to content

Commit 9850823

Browse files
committed
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
2 parents 24ecfdf + b5651a2 commit 9850823

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

Documentation/config/feature.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ feature.experimental::
1515
* `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by
1616
skipping more commits at a time, reducing the number of round trips.
1717
+
18-
* `fetch.writeCommitGraph=true` writes a commit-graph after every `git fetch`
19-
command that downloads a pack-file from a remote. Using the `--split` option,
20-
most executions will create a very small commit-graph file on top of the
21-
existing commit-graph file(s). Occasionally, these files will merge and the
22-
write may take longer. Having an updated commit-graph file helps performance
23-
of many Git commands, including `git merge-base`, `git push -f`, and
24-
`git log --graph`.
25-
+
2618
* `protocol.version=2` speeds up fetches from repositories with many refs by
2719
allowing the client to specify which refs to list before the server lists
2820
them.

Documentation/config/fetch.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,4 @@ fetch.writeCommitGraph::
9090
the existing commit-graph file(s). Occasionally, these files will
9191
merge and the write may take longer. Having an updated commit-graph
9292
file helps performance of many Git commands, including `git merge-base`,
93-
`git push -f`, and `git log --graph`. Defaults to false, unless
94-
`feature.experimental` is true.
93+
`git push -f`, and `git log --graph`. Defaults to false.

repo-settings.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ void prepare_repo_settings(struct repository *r)
5151
UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
5252
UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
5353
}
54+
5455
if (!repo_config_get_bool(r, "fetch.writecommitgraph", &value))
5556
r->settings.fetch_write_commit_graph = value;
56-
if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
57-
UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
58-
UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 1);
59-
}
6057
UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0);
6158

59+
if (!repo_config_get_bool(r, "feature.experimental", &value) && value)
60+
UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
61+
6262
/* Hack for test programs like test-dump-untracked-cache */
6363
if (ignore_untracked_cache_config)
6464
r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;

0 commit comments

Comments
 (0)