t6036: add a failed conflict detection case with symlink add/add

diff --git a/commit-graph.h b/commit-graph.h
index 73b28beed15b952ced9ec1b0e978f507a552e823..96cccb10f3d53a6da77f4ad06a971dbaa152f70c 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -17,6 +17,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,6 +46,11 @@ struct commit_graph {
 
 struct commit_graph *load_commit_graph_one(const char *graph_file);
 
-void write_commit_graph(const char *obj_dir);
+void write_commit_graph(const char *obj_dir,
+                       const char **pack_indexes,
+                       int nr_packs,
+                       const char **commit_hex,
+                       int nr_commits,
+                       int append);
 
 #endif