diff-index: enable recursive pathspec matching in unpack_trees

diff --git a/tree.h b/tree.h
index a27bae41ba48c7f04f7abda0bfce25587eb46ebe..69bcb5e0ec27de6699e349b8dcec26f1cbc4e741 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -5,22 +5,10 @@
 
 extern const char *tree_type;
 
-struct tree_entry_list {
-       struct tree_entry_list *next;
-       unsigned directory : 1;
-       unsigned executable : 1;
-       unsigned symlink : 1;
-       unsigned zeropad : 1;
-       unsigned int mode;
-       const char *name;
-       const unsigned char *sha1;
-};
-
 struct tree {
        struct object object;
        void *buffer;
        unsigned long size;
-       struct tree_entry_list *entries;
 };
 
 struct tree *lookup_tree(const unsigned char *sha1);
@@ -33,13 +21,13 @@ int parse_tree(struct tree *tree);
 struct tree *parse_tree_indirect(const unsigned char *sha1);
 
 #define READ_TREE_RECURSIVE 1
-typedef int (*read_tree_fn_t)(const unsigned char *, const char *, int, const char *, unsigned int, int);
+typedef int (*read_tree_fn_t)(const unsigned char *, const char *, int, const char *, unsigned int, int, void *);
 
 extern int read_tree_recursive(struct tree *tree,
                               const char *base, int baselen,
-                              int stage, const char **match,
-                              read_tree_fn_t fn);
+                              int stage, struct pathspec *pathspec,
+                              read_tree_fn_t fn, void *context);
 
-extern int read_tree(struct tree *tree, int stage, const char **paths);
+extern int read_tree(struct tree *tree, int stage, struct pathspec *pathspec);
 
 #endif /* TREE_H */