X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.h;h=c7b524861b059234621c4f2c645acd56205867fc;hb=097dc3d8c32f4b85bf9701d5e1de98999ac25c1c;hp=74fe09d7634661d208f88536cf831c3858766450;hpb=5d6ccf5ce7f28e576a87f6c6f4f99fae90e06db6;p=git.git

diff --git a/tree.h b/tree.h
index 74fe09d7..c7b52486 100644
--- a/tree.h
+++ b/tree.h
@@ -10,24 +10,38 @@ struct tree_entry_list {
 	unsigned directory : 1;
 	unsigned executable : 1;
 	unsigned symlink : 1;
+	unsigned zeropad : 1;
 	unsigned int mode;
-	char *name;
-	union {
-		struct tree *tree;
-		struct blob *blob;
-	} item;
-	struct tree_entry_list *parent;
+	const char *name;
+	const unsigned char *sha1;
 };
 
 struct tree {
 	struct object object;
-	struct tree_entry_list *entries;
+	void *buffer;
+	unsigned long size;
 };
 
+struct tree_entry_list *create_tree_entry_list(struct tree *);
+void free_tree_entry_list(struct tree_entry_list *);
+
 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)(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 */