about summary refs log tree commit diff
path: root/third_party/git/unpack-trees.h
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/unpack-trees.h')
-rw-r--r--third_party/git/unpack-trees.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/third_party/git/unpack-trees.h b/third_party/git/unpack-trees.h
index d344d7d29694..ae1557fb8046 100644
--- a/third_party/git/unpack-trees.h
+++ b/third_party/git/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);
@@ -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;
@@ -83,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,