Merge branch 'lt/logopt' into next

diff --git a/commit.h b/commit.h
index 98682b232a2c28a4baa970ec81dfb027c196872f..918c9ab5e4eb3173c0d0a0748df40ef857fc7b8b 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -90,4 +90,15 @@ void sort_in_topological_order(struct commit_list ** list, int lifo);
 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
                                  topo_sort_set_fn_t setter,
                                  topo_sort_get_fn_t getter);
+
+struct commit_graft {
+       unsigned char sha1[20];
+       int nr_parent;
+       unsigned char parent[FLEX_ARRAY][20]; /* more */
+};
+
+struct commit_graft *read_graft_line(char *buf, int len);
+int register_commit_graft(struct commit_graft *, int);
+int read_graft_file(const char *graft_file);
+
 #endif /* COMMIT_H */