summaryrefslogtreecommitdiff
path: root/commit-graph.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 /commit-graph.h
parentcfec6133cfcd97a23ca29c7d0ad8d2961796dd52 (diff)
parentdade47c06cf849b0ca180a8e6383b55ea6f75812 (diff)
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 'commit-graph.h')
-rw-r--r--commit-graph.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/commit-graph.h b/commit-graph.h
index 506cb45fb1..76e098934a 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -5,6 +5,8 @@
#include "repository.h"
#include "string-list.h"
+struct commit;
+
char *get_commit_graph_filename(const char *obj_dir);
/*
@@ -17,7 +19,7 @@ char *get_commit_graph_filename(const char *obj_dir);
*
* See parse_commit_buffer() for the fallback after this call.
*/
-int parse_commit_in_graph(struct commit *item);
+int parse_commit_in_graph(struct repository *r, struct commit *item);
/*
* It is possible that we loaded commit contents from the commit buffer,
@@ -25,9 +27,10 @@ int parse_commit_in_graph(struct commit *item);
* checked and filled. Fill the graph_pos and generation members of
* the given commit.
*/
-void load_commit_graph_info(struct commit *item);
+void load_commit_graph_info(struct repository *r, struct commit *item);
-struct tree *get_commit_tree_in_graph(const struct commit *c);
+struct tree *get_commit_tree_in_graph(struct repository *r,
+ const struct commit *c);
struct commit_graph {
int graph_fd;
@@ -56,4 +59,6 @@ void write_commit_graph(const char *obj_dir,
int verify_commit_graph(struct repository *r, struct commit_graph *g);
+void free_commit_graph(struct commit_graph *);
+
#endif