Use git-merge in git-pull (second try).
[git/jrn.git] / tree.h
blob9975e88216dc6924c1d6e9ec3c7ae6d90c2df1dd
1 #ifndef TREE_H
2 #define TREE_H
4 #include "object.h"
6 extern const char *tree_type;
8 struct tree_entry_list {
9 struct tree_entry_list *next;
10 unsigned directory : 1;
11 unsigned executable : 1;
12 unsigned symlink : 1;
13 unsigned zeropad : 1;
14 unsigned int mode;
15 char *name;
16 union {
17 struct object *any;
18 struct tree *tree;
19 struct blob *blob;
20 } item;
21 struct tree_entry_list *parent;
24 struct tree {
25 struct object object;
26 struct tree_entry_list *entries;
29 struct tree *lookup_tree(const unsigned char *sha1);
31 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
33 int parse_tree(struct tree *tree);
35 /* Parses and returns the tree in the given ent, chasing tags and commits. */
36 struct tree *parse_tree_indirect(const unsigned char *sha1);
38 #endif /* TREE_H */