Merge refs/heads/master from .

diff --git a/tree.h b/tree.h
index ae61bcca6e32b176c0499a8ffc9d5af619b31058..0df065ae363c016b17db26f00b982396baf066db 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -14,6 +14,7 @@ struct tree_entry_list {
        unsigned int mode;
        char *name;
        union {
+               struct object *any;
                struct tree *tree;
                struct blob *blob;
        } item;