X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.h;h=a27bae41ba48c7f04f7abda0bfce25587eb46ebe;hb=a755dfe45c10ccd9f180d3c267602ad18d127d6a;hp=330ab64bbd40bd9202a7474cbda0818b98640cde;hpb=3d990f110c2e5b8df83f6ab3ef83497f43c7fd47;p=git.git diff --git a/tree.h b/tree.h index 330ab64b..a27bae41 100644 --- a/tree.h +++ b/tree.h @@ -12,16 +12,14 @@ struct tree_entry_list { unsigned symlink : 1; unsigned zeropad : 1; unsigned int mode; - char *name; - union { - struct object *any; - struct tree *tree; - struct blob *blob; - } item; + const char *name; + const unsigned char *sha1; }; struct tree { struct object object; + void *buffer; + unsigned long size; struct tree_entry_list *entries; }; @@ -35,7 +33,7 @@ int parse_tree(struct tree *tree); struct tree *parse_tree_indirect(const unsigned char *sha1); #define READ_TREE_RECURSIVE 1 -typedef int (*read_tree_fn_t)(unsigned char *, const char *, int, const char *, unsigned int, int); +typedef int (*read_tree_fn_t)(const unsigned char *, const char *, int, const char *, unsigned int, int); extern int read_tree_recursive(struct tree *tree, const char *base, int baselen,