Make sure the empty tree exists when needed in merge-recursive.

diff --git a/tree.h b/tree.h
index a27bae41ba48c7f04f7abda0bfce25587eb46ebe..dd25c539efbb0ab018caa4cda2d133285634e9b5 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -5,22 +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;
-       const unsigned char *sha1;
-};
-
 struct tree {
        struct object object;
        void *buffer;
        unsigned long size;
-       struct tree_entry_list *entries;
 };
 
 struct tree *lookup_tree(const unsigned char *sha1);