Merge branch 'tb/grep-only-matching'

diff --git a/commit-graph.h b/commit-graph.h
index 96cccb10f3d53a6da77f4ad06a971dbaa152f70c..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);
 
@@ -46,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