diff options
| author | Taylor Blau <me@ttaylorr.com> | 2020-09-09 15:23:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-09 19:51:48 (GMT) |
| commit | b66d84756f0f3704303ddc202707ac00037ace48 (patch) | |
| tree | 5edb785058da52f0d342bf6ac51e0457b2ced828 /repo-settings.c | |
| parent | 24f951a4924e72e51d4b658084902390f341ec2e (diff) | |
| download | git-b66d84756f0f3704303ddc202707ac00037ace48.zip git-b66d84756f0f3704303ddc202707ac00037ace48.tar.gz git-b66d84756f0f3704303ddc202707ac00037ace48.tar.bz2 | |
commit-graph: respect 'commitGraph.readChangedPaths'
Git uses the 'core.commitGraph' configuration value to control whether
or not the commit graph is used when parsing commits or performing a
traversal.
Now that commit-graphs can also contain a section for changed-path Bloom
filters, administrators that already have commit-graphs may find it
convenient to use those graphs without relying on their changed-path
Bloom filters. This can happen, for example, during a staged roll-out,
or in the event of an incident.
Introduce 'commitGraph.readChangedPaths' to control whether or not Bloom
filters are read. Note that this configuration is independent from both:
- 'core.commitGraph', to allow flexibility in using all parts of a
commit-graph _except_ for its Bloom filters.
- The '--changed-paths' option for 'git commit-graph write', to allow
reading and writing Bloom filters to be controlled independently.
When the variable is set, pretend as if no Bloom data was specified at
all. This avoids adding additional special-casing outside of the
commit-graph internals.
Suggested-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'repo-settings.c')
| -rw-r--r-- | repo-settings.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/repo-settings.c b/repo-settings.c index 0918408..9e551bc 100644 --- a/repo-settings.c +++ b/repo-settings.c @@ -17,9 +17,12 @@ void prepare_repo_settings(struct repository *r) if (!repo_config_get_bool(r, "core.commitgraph", &value)) r->settings.core_commit_graph = value; + if (!repo_config_get_bool(r, "commitgraph.readchangedpaths", &value)) + r->settings.commit_graph_read_changed_paths = value; if (!repo_config_get_bool(r, "gc.writecommitgraph", &value)) r->settings.gc_write_commit_graph = value; UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1); + UPDATE_DEFAULT_BOOL(r->settings.commit_graph_read_changed_paths, 1); UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1); if (!repo_config_get_int(r, "index.version", &value)) |