aboutsummaryrefslogtreecommitdiff
path: root/object-store.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-02 15:30:47 -0700
committerJunio C Hamano <gitster@pobox.com>2018-08-02 15:30:47 -0700
commit78a72ad4f8fa91adc876b2fc4b18fd370e43136d (patch)
treea00b516dce8736567e679878f1b00966ef705f4a /object-store.h
parentcfec6133cfcd97a23ca29c7d0ad8d2961796dd52 (diff)
parentdade47c06cf849b0ca180a8e6383b55ea6f75812 (diff)
downloadgit-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 'object-store.h')
-rw-r--r--object-store.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/object-store.h b/object-store.h
index a3db17bbf5..e481f7ad41 100644
--- a/object-store.h
+++ b/object-store.h
@@ -2,6 +2,9 @@
#define OBJECT_STORE_H
#include "oidmap.h"
+#include "list.h"
+#include "sha1-array.h"
+#include "strbuf.h"
struct alternate_object_database {
struct alternate_object_database *next;
@@ -103,6 +106,9 @@ struct raw_object_store {
*/
struct oidmap *replace_map;
+ struct commit_graph *commit_graph;
+ unsigned commit_graph_attempted : 1; /* if loading has been attempted */
+
/*
* private data
*