Merge fixes up to GIT 1.0.4

diff --git a/tree.h b/tree.h
index 19b190565957a7a03c34f7efa68a7fe0c6783d04..57a5bf71f2f5f6eb8f4f75709670d36ee6976683 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -9,8 +9,12 @@ struct tree_entry_list {
        struct tree_entry_list *next;
        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;
@@ -18,12 +22,25 @@ struct tree_entry_list {
 
 struct tree {
        struct object object;
-       unsigned has_full_path : 1;
        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(void *buffer, unsigned long size,
+                       const char *base, int baselen,
+                       int stage, const char **match,
+                       read_tree_fn_t fn);
+
+
 #endif /* TREE_H */