diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-09 22:26:36 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 22:26:36 +0300 |
| commit | f4f8dfe127918241c1e3448436d32a89f13fa5a8 (patch) | |
| tree | 7da8889b7333a7744024f53192f397f68b5b9761 /commit-graph.c | |
| parent | 4a12f89865236789b5723277bb6809e92ce68f54 (diff) | |
| parent | aaf633c2ad10b47af7623c130ddfe7231658c7e4 (diff) | |
Merge branch 'ds/feature-macros'
A mechanism to affect the default setting for a (related) group of
configuration variables is introduced.
* ds/feature-macros:
repo-settings: create feature.experimental setting
repo-settings: create feature.manyFiles setting
repo-settings: parse core.untrackedCache
commit-graph: turn on commit-graph by default
t6501: use 'git gc' in quiet mode
repo-settings: consolidate some config settings
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/commit-graph.c b/commit-graph.c index f2888c203b..9b02d2c426 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -467,7 +467,6 @@ static void prepare_commit_graph_one(struct repository *r, const char *obj_dir) static int prepare_commit_graph(struct repository *r) { struct object_directory *odb; - int config_value; if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0)) die("dying as requested by the '%s' variable on commit-graph load!", @@ -477,9 +476,10 @@ static int prepare_commit_graph(struct repository *r) return !!r->objects->commit_graph; r->objects->commit_graph_attempted = 1; + prepare_repo_settings(r); + if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - (repo_config_get_bool(r, "core.commitgraph", &config_value) || - !config_value)) + r->settings.core_commit_graph != 1) /* * This repository is not configured to use commit graphs, so * do not load one. (But report commit_graph_attempted anyway |