Make "tree_entry" have a SHA1 instead of a union of object pointers
This is preparatory work for further cleanups, where we try to make tree_entry look more like the more efficient tree-walk descriptor. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
136f2e548a
commit
3a7c352bd0
8
tree.h
8
tree.h
@ -13,11 +13,7 @@ struct tree_entry_list {
|
||||
unsigned zeropad : 1;
|
||||
unsigned int mode;
|
||||
const char *name;
|
||||
union {
|
||||
struct object *any;
|
||||
struct tree *tree;
|
||||
struct blob *blob;
|
||||
} item;
|
||||
const unsigned char *sha1;
|
||||
};
|
||||
|
||||
struct tree {
|
||||
@ -37,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,
|
||||
|
Reference in New Issue
Block a user