Merge refs/heads/master from .

diff --git a/tree.h b/tree.h
index 74fe09d7634661d208f88536cf831c3858766450..0df065ae363c016b17db26f00b982396baf066db 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -10,9 +10,11 @@ struct tree_entry_list {
        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;