diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:47 -0700 |
| commit | 78a72ad4f8fa91adc876b2fc4b18fd370e43136d (patch) | |
| tree | a00b516dce8736567e679878f1b00966ef705f4a /builtin | |
| parent | Merge branch 'es/chain-lint-in-subshell' (diff) | |
| parent | commit-graph: add repo arg to graph readers (diff) | |
| download | tgif-78a72ad4f8fa91adc876b2fc4b18fd370e43136d.tar.xz | |
Merge branch 'jt/commit-graph-per-object-store'
The singleton commit-graph in-core instance is made per in-core
repository instance.
* jt/commit-graph-per-object-store:
commit-graph: add repo arg to graph readers
commit-graph: store graph in struct object_store
commit-graph: add free_commit_graph
commit-graph: add missing forward declaration
object-store: add missing include
commit-graph: refactor preparing commit graph
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit-graph.c | 2 | ||||
| -rw-r--r-- | builtin/fsck.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index c7d0db5ab4..0bf0c48657 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -115,6 +115,8 @@ static int graph_read(int argc, const char **argv) printf(" large_edges"); printf("\n"); + free_commit_graph(graph); + return 0; } diff --git a/builtin/fsck.c b/builtin/fsck.c index ea5e2a03e6..c96f3f4fcc 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -830,7 +830,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) check_connectivity(); - if (core_commit_graph) { + if (!git_config_get_bool("core.commitgraph", &i) && i) { struct child_process commit_graph_verify = CHILD_PROCESS_INIT; const char *verify_argv[] = { "commit-graph", "verify", NULL, NULL, NULL }; |