Merge branch 'vb/sendemail' into next

diff --git a/tree.h b/tree.h
index 066ac5d5bfa38ec8b61e4a8c9b1d75c1959eaa03..dd25c539efbb0ab018caa4cda2d133285634e9b5 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -5,26 +5,10 @@
 
 extern const char *tree_type;
 
-struct tree_entry_list {
-       struct tree_entry_list *next;
-       unsigned directory : 1;
-       unsigned executable : 1;
-       unsigned symlink : 1;
-       unsigned zeropad : 1;
-       unsigned int mode;
-       const char *name;
-       union {
-               struct object *any;
-               struct tree *tree;
-               struct blob *blob;
-       } item;
-};
-
 struct tree {
        struct object object;
        void *buffer;
        unsigned long size;
-       struct tree_entry_list *entries;
 };
 
 struct tree *lookup_tree(const unsigned char *sha1);
@@ -37,7 +21,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,