Merge branch 'js/patch'

diff --git a/tree.h b/tree.h
index 0df065ae363c016b17db26f00b982396baf066db..dd25c539efbb0ab018caa4cda2d133285634e9b5 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -5,25 +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;
-       char *name;
-       union {
-               struct object *any;
-               struct tree *tree;
-               struct blob *blob;
-       } item;
-       struct tree_entry_list *parent;
-};
-
 struct tree {
        struct object object;
-       struct tree_entry_list *entries;
+       void *buffer;
+       unsigned long size;
 };
 
 struct tree *lookup_tree(const unsigned char *sha1);
@@ -32,4 +17,17 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
 
 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)(const 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 */