Merge branch 'ds/include-exclude'

diff --git a/unpack-trees.h b/unpack-trees.h
index d344d7d29694dbf64d6874163810e65915167fd8..f2eee0c7c54cf3f2a8d08462ce44ea01236e1a16 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -10,7 +10,7 @@
 
 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);
@@ -83,7 +83,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,