merge-one-file: fix broken merges with alternate work trees

diff --git a/unpack-trees.h b/unpack-trees.h
index 0d26f3d73e773230972db86f34a5147ada881e8b..ef70eab39025fcdaccda059692ae447a13fa0aeb 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -4,6 +4,7 @@
 #define MAX_UNPACK_TREES 8
 
 struct unpack_trees_options;
+struct exclude_list;
 
 typedef int (*merge_fn_t)(struct cache_entry **src,
                struct unpack_trees_options *options);
@@ -14,22 +15,27 @@ struct unpack_trees_error_msgs {
        const char *not_uptodate_dir;
        const char *would_lose_untracked;
        const char *bind_overlap;
+       const char *sparse_not_uptodate_file;
+       const char *would_lose_orphaned;
 };
 
 struct unpack_trees_options {
-       unsigned int reset:1,
-                    merge:1,
-                    update:1,
-                    index_only:1,
-                    nontrivial_merge:1,
-                    trivial_merges_only:1,
-                    verbose_update:1,
-                    aggressive:1,
-                    skip_unmerged:1,
-                    initial_checkout:1,
-                    gently:1;
+       unsigned int reset,
+                    merge,
+                    update,
+                    index_only,
+                    nontrivial_merge,
+                    trivial_merges_only,
+                    verbose_update,
+                    aggressive,
+                    skip_unmerged,
+                    initial_checkout,
+                    diff_index_cached,
+                    debug_unpack,
+                    skip_sparse_checkout,
+                    gently;
        const char *prefix;
-       int pos;
+       int cache_bottom;
        struct dir_struct *dir;
        merge_fn_t fn;
        struct unpack_trees_error_msgs msgs;
@@ -43,6 +49,8 @@ struct unpack_trees_options {
        struct index_state *dst_index;
        struct index_state *src_index;
        struct index_state result;
+
+       struct exclude_list *el; /* for internal use */
 };
 
 extern int unpack_trees(unsigned n, struct tree_desc *t,