diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:58 +0300 |
| commit | 06880cff3892185ae71839636e2d2c688413eccb (patch) | |
| tree | 384648785a690c489a009f16d4c7d1e39901344d /commit-graph.c | |
| parent | b4583001b4387b454b5afffebb8b350fca291393 (diff) | |
| parent | 859fdc0c3cf9ad8cdd5eacaa24aee481bc1e7bc1 (diff) | |
Merge branch 'ds/commit-graph-tests'
We can now optionally run tests with commit-graph enabled.
* ds/commit-graph-tests:
commit-graph: define GIT_TEST_COMMIT_GRAPH
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/commit-graph.c b/commit-graph.c index ae6cabb4cd..7f4519ec3b 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -213,8 +213,9 @@ static int prepare_commit_graph(struct repository *r) return !!r->objects->commit_graph; r->objects->commit_graph_attempted = 1; - if (repo_config_get_bool(r, "core.commitgraph", &config_value) || - !config_value) + if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && + (repo_config_get_bool(r, "core.commitgraph", &config_value) || + !config_value)) /* * This repository is not configured to use commit graphs, so * do not load one. (But report commit_graph_attempted anyway |