X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.h;h=066ac5d5bfa38ec8b61e4a8c9b1d75c1959eaa03;hb=d2eafb76611670d7573f9409b0c727019fe50e18;hp=e1c94c090c8d73268176e8f1ca97f4949cb537df;hpb=74c7cfa875448c71a18d21a0cc7c973afe759fa5;p=git.git

diff --git a/tree.h b/tree.h
index e1c94c09..066ac5d5 100644
--- a/tree.h
+++ b/tree.h
@@ -10,9 +10,11 @@ struct tree_entry_list {
 	unsigned directory : 1;
 	unsigned executable : 1;
 	unsigned symlink : 1;
+	unsigned zeropad : 1;
 	unsigned int mode;
-	char *name;
+	const char *name;
 	union {
+		struct object *any;
 		struct tree *tree;
 		struct blob *blob;
 	} item;
@@ -20,11 +22,28 @@ struct tree_entry_list {
 
 struct tree {
 	struct object object;
+	void *buffer;
+	unsigned long size;
 	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 */