Merge branch 'jc/simpack' into next

diff --git a/tree.h b/tree.h
index 9975e88216dc6924c1d6e9ec3c7ae6d90c2df1dd..330ab64bbd40bd9202a7474cbda0818b98640cde 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -18,7 +18,6 @@ struct tree_entry_list {
                struct tree *tree;
                struct blob *blob;
        } item;
-       struct tree_entry_list *parent;
 };
 
 struct tree {
@@ -35,4 +34,14 @@ int parse_tree(struct tree *tree);
 /* Parses and returns the tree in the given ent, chasing tags and commits. */
 struct tree *parse_tree_indirect(const unsigned char *sha1);
 
+#define READ_TREE_RECURSIVE 1
+typedef int (*read_tree_fn_t)(unsigned char *, const char *, int, const char *, unsigned int, int);
+
+extern int read_tree_recursive(struct tree *tree,
+                              const char *base, int baselen,
+                              int stage, const char **match,
+                              read_tree_fn_t fn);
+
+extern int read_tree(struct tree *tree, int stage, const char **paths);
+
 #endif /* TREE_H */