config doc: fix reference to config.worktree info

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

diff --git a/unpack-trees.h b/unpack-trees.h
index 847f217dbaecea678f48d5086e7099c3c24a53c4..ae1557fb8046c957dfa1feef6349a0117617f389 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -6,11 +6,11 @@
 #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;
-struct exclude_list;
+struct pattern_list;
 
 typedef int (*merge_fn_t)(const struct cache_entry * const *src,
                struct unpack_trees_options *options);
@@ -45,6 +45,7 @@ struct unpack_trees_options {
        unsigned int reset,
                     merge,
                     update,
+                    clone,
                     index_only,
                     nontrivial_merge,
                     trivial_merges_only,
@@ -55,10 +56,11 @@ struct unpack_trees_options {
                     diff_index_cached,
                     debug_unpack,
                     skip_sparse_checkout,
-                    gently,
+                    quiet,
                     exiting_early,
                     show_all_errors,
-                    dry_run;
+                    dry_run,
+                    keep_pattern_list;
        const char *prefix;
        int cache_bottom;
        struct dir_struct *dir;
@@ -82,7 +84,7 @@ struct unpack_trees_options {
        struct index_state *src_index;
        struct index_state result;
 
-       struct exclude_list *el; /* for internal use */
+       struct pattern_list *pl; /* for internal use */
 };
 
 int unpack_trees(unsigned n, struct tree_desc *t,