X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=tree.h;h=a27bae41ba48c7f04f7abda0bfce25587eb46ebe;hb=3a7c352bd0ecac4b4c96c0995d61de9ef8d814f9;hp=768e5e9eb894d37c0dca452bc7d96a1271035b55;hpb=423325a2d24638ddcc82ce47be5e40be550f4507;p=git.git

diff --git a/tree.h b/tree.h
index 768e5e9e..a27bae41 100644
--- a/tree.h
+++ b/tree.h
@@ -12,17 +12,14 @@ struct tree_entry_list {
 	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;
+	const char *name;
+	const unsigned char *sha1;
 };
 
 struct tree {
 	struct object object;
+	void *buffer;
+	unsigned long size;
 	struct tree_entry_list *entries;
 };
 
@@ -36,12 +33,13 @@ 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(void *buffer, unsigned long size,
-			const char *base, int baselen,
-			int stage, const char **match,
-			read_tree_fn_t fn);
+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 */