Merge branch 'tb/grep-only-matching'

diff --git a/commit-graph.h b/commit-graph.h
index e1d8580c98a24a51e64c4d0f1d9abda10c5e92f2..506cb45fb1178256b2d6c9752c28e300fc0791b2 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -2,6 +2,8 @@
 #define COMMIT_GRAPH_H
 
 #include "git-compat-util.h"
+#include "repository.h"
+#include "string-list.h"
 
 char *get_commit_graph_filename(const char *obj_dir);
 
@@ -17,6 +19,16 @@ char *get_commit_graph_filename(const char *obj_dir);
  */
 int parse_commit_in_graph(struct commit *item);
 
+/*
+ * It is possible that we loaded commit contents from the commit buffer,
+ * but we also want to ensure the commit-graph content is correctly
+ * checked and filled. Fill the graph_pos and generation members of
+ * the given commit.
+ */
+void load_commit_graph_info(struct commit *item);
+
+struct tree *get_commit_tree_in_graph(const struct commit *c);
+
 struct commit_graph {
        int graph_fd;
 
@@ -36,11 +48,12 @@ struct commit_graph {
 
 struct commit_graph *load_commit_graph_one(const char *graph_file);
 
+void write_commit_graph_reachable(const char *obj_dir, int append);
 void write_commit_graph(const char *obj_dir,
-                       const char **pack_indexes,
-                       int nr_packs,
-                       const char **commit_hex,
-                       int nr_commits,
+                       struct string_list *pack_indexes,
+                       struct string_list *commit_hex,
                        int append);
 
+int verify_commit_graph(struct repository *r, struct commit_graph *g);
+
 #endif