X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.h;h=9975e88216dc6924c1d6e9ec3c7ae6d90c2df1dd;hb=942c1f53aef03cb3d8b5c39b38997a379c3fad20;hp=1383beb2bf11f66bc34246acc5d843866ae680c9;hpb=bd2c39f58f915af532b488c5bda753314f0db603;p=git.git

diff --git a/tree.h b/tree.h
index 1383beb2..9975e882 100644
--- a/tree.h
+++ b/tree.h
@@ -10,12 +10,15 @@ 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 {
@@ -23,10 +26,13 @@ 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);
+
 #endif /* TREE_H */