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

diff --git a/tree.h b/tree.h
index 066ac5d5..a27bae41 100644
--- a/tree.h
+++ b/tree.h
@@ -13,11 +13,7 @@ struct tree_entry_list {
 	unsigned zeropad : 1;
 	unsigned int mode;
 	const char *name;
-	union {
-		struct object *any;
-		struct tree *tree;
-		struct blob *blob;
-	} item;
+	const unsigned char *sha1;
 };
 
 struct tree {
@@ -37,7 +33,7 @@ int parse_tree(struct tree *tree);
 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);
+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,