Merge branch 'pw/rebase-x-sanity-check'

diff --git a/merge-recursive.h b/merge-recursive.h
index e39ee5d78be6bb460bef18aac61deb1ca9b55da0..c2b7bb65c62ff51af1b89087bbf6692060b5962e 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -1,8 +1,12 @@
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 
-#include "unpack-trees.h"
 #include "string-list.h"
+#include "unpack-trees.h"
+
+struct commit;
+
+struct repository;
 
 struct merge_options {
        const char *ancestor;
@@ -32,6 +36,7 @@ struct merge_options {
        struct string_list df_conflict_file_set;
        struct unpack_trees_options unpack_opts;
        struct index_state orig_index;
+       struct repository *repo;
 };
 
 /*
@@ -90,7 +95,8 @@ int merge_recursive_generic(struct merge_options *o,
                            const struct object_id **ca,
                            struct commit **result);
 
-void init_merge_options(struct merge_options *o);
+void init_merge_options(struct merge_options *o,
+                       struct repository *repo);
 struct tree *write_tree_from_memory(struct merge_options *o);
 
 int parse_merge_opt(struct merge_options *out, const char *s);