git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.

diff --git a/unpack-trees.h b/unpack-trees.h
index 701dca59a8e828cae78c394783ff8d6f8404a5f1..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,6 +15,8 @@ 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 {
@@ -29,6 +32,7 @@ struct unpack_trees_options {
                     initial_checkout,
                     diff_index_cached,
                     debug_unpack,
+                    skip_sparse_checkout,
                     gently;
        const char *prefix;
        int cache_bottom;
@@ -45,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,