merge-recursive: fix overwriting dirty files involved in renames

diff --git a/merge-recursive.h b/merge-recursive.h
index fe64c78de403cf165d45421184b05205717f015e..d863cf88676ef321aad85d395f964efe5673a805 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -1,6 +1,7 @@
 #ifndef MERGE_RECURSIVE_H
 #define MERGE_RECURSIVE_H
 
+#include "unpack-trees.h"
 #include "string-list.h"
 
 struct merge_options {
@@ -27,6 +28,7 @@ struct merge_options {
        struct strbuf obuf;
        struct hashmap current_file_dir_set;
        struct string_list df_conflict_file_set;
+       struct unpack_trees_options unpack_opts;
 };
 
 /*
@@ -47,6 +49,13 @@ struct dir_rename_entry {
        struct string_list possible_new_dirs;
 };
 
+struct collision_entry {
+       struct hashmap_entry ent; /* must be the first member! */
+       char *target_file;
+       struct string_list source_files;
+       unsigned reported_already:1;
+};
+
 /* merge_trees() but with recursive ancestor consolidation */
 int merge_recursive(struct merge_options *o,
                    struct commit *h1,