Check another error condition in git-mv

diff --git a/tree.h b/tree.h
index 74fe09d7634661d208f88536cf831c3858766450..9975e88216dc6924c1d6e9ec3c7ae6d90c2df1dd 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;
@@ -30,4 +32,7 @@ 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);
+
 #endif /* TREE_H */