merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/commit-graph.h b/commit-graph.h
index 76e098934a7f6740b52a479baa5c68fe605d1ea6..b05047676514e4d031ac90de50510eb33a4b6db6 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -4,6 +4,9 @@
 #include "git-compat-util.h"
 #include "repository.h"
 #include "string-list.h"
+#include "cache.h"
+
+#define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH"
 
 struct commit;
 
@@ -51,6 +54,12 @@ struct commit_graph {
 
 struct commit_graph *load_commit_graph_one(const char *graph_file);
 
+/*
+ * Return 1 if and only if the repository has a commit-graph
+ * file and generation numbers are computed in that file.
+ */
+int generation_numbers_enabled(struct repository *r);
+
 void write_commit_graph_reachable(const char *obj_dir, int append);
 void write_commit_graph(const char *obj_dir,
                        struct string_list *pack_indexes,