[PATCH] git bugfixes and cleanups, mainly Debian things

diff --git a/tree.h b/tree.h
index 1383beb2bf11f66bc34246acc5d843866ae680c9..0df065ae363c016b17db26f00b982396baf066db 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -10,12 +10,15 @@ 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;
+       struct tree_entry_list *parent;
 };
 
 struct tree {
@@ -23,7 +26,7 @@ struct tree {
        struct tree_entry_list *entries;
 };
 
-struct tree *lookup_tree(unsigned char *sha1);
+struct tree *lookup_tree(const unsigned char *sha1);
 
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);