t4216: avoid unnecessary subshell in test_bloom_filters_not_used

[thirdparty/git.git] / unpack-trees.h

diff --git a/unpack-trees.h b/unpack-trees.h
index f2eee0c7c54cf3f2a8d08462ce44ea01236e1a16..ad41b45a7139aacad7ded1ddcf6774d5b031e7a7 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -6,7 +6,7 @@
 #include "string-list.h"
 #include "tree-walk.h"
 
-#define MAX_UNPACK_TREES 8
+#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
 
 struct cache_entry;
 struct unpack_trees_options;
@@ -59,7 +59,8 @@ struct unpack_trees_options {
                     quiet,
                     exiting_early,
                     show_all_errors,
-                    dry_run;
+                    dry_run,
+                    keep_pattern_list;
        const char *prefix;
        int cache_bottom;
        struct dir_struct *dir;
@@ -84,6 +85,7 @@ struct unpack_trees_options {
        struct index_state result;
 
        struct pattern_list *pl; /* for internal use */
+       struct checkout_metadata meta;
 };
 
 int unpack_trees(unsigned n, struct tree_desc *t,