X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.h;h=330ab64bbd40bd9202a7474cbda0818b98640cde;hb=73136b2e8a8ee024320c5ac6a0f14f912432bf03;hp=056bd86fa9e5a62207bd52fbb124f080e8854253;hpb=6af1f0192ff8740fe77db7cf02c739ccfbdf119c;p=git.git

diff --git a/tree.h b/tree.h
index 056bd86f..330ab64b 100644
--- a/tree.h
+++ b/tree.h
@@ -10,13 +10,14 @@ struct tree_entry_list {
 	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 {
@@ -24,10 +25,23 @@ struct tree {
 	struct tree_entry_list *entries;
 };
 
-struct tree *lookup_tree(unsigned char *sha1);
+struct tree *lookup_tree(const unsigned char *sha1);
 
 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)(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 */