git manpage: note git-security@googlegroups.com

diff --git a/tree.h b/tree.h
index 066ac5d5bfa38ec8b61e4a8c9b1d75c1959eaa03..744e6dc2ac883adfa0e079f5f84f45a45e22b59d 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -4,46 +4,37 @@
 #include "object.h"
 
 extern const char *tree_type;
-
-struct tree_entry_list {
-       struct tree_entry_list *next;
-       unsigned directory : 1;
-       unsigned executable : 1;
-       unsigned symlink : 1;
-       unsigned zeropad : 1;
-       unsigned int mode;
-       const char *name;
-       union {
-               struct object *any;
-               struct tree *tree;
-               struct blob *blob;
-       } item;
-};
+struct strbuf;
 
 struct tree {
        struct object object;
        void *buffer;
        unsigned long size;
-       struct tree_entry_list *entries;
 };
 
-struct tree *lookup_tree(const unsigned char *sha1);
+struct tree *lookup_tree(const struct object_id *oid);
 
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
 
-int parse_tree(struct tree *tree);
+int parse_tree_gently(struct tree *tree, int quiet_on_missing);
+static inline int parse_tree(struct tree *tree)
+{
+       return parse_tree_gently(tree, 0);
+}
+void free_tree_buffer(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);
+struct tree *parse_tree_indirect(const struct object_id *oid);
 
 #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 *, struct strbuf *, const char *, unsigned int, int, void *);
 
 extern int read_tree_recursive(struct tree *tree,
                               const char *base, int baselen,
-                              int stage, const char **match,
-                              read_tree_fn_t fn);
+                              int stage, const struct pathspec *pathspec,
+                              read_tree_fn_t fn, void *context);
 
-extern int read_tree(struct tree *tree, int stage, const char **paths);
+extern int read_tree(struct tree *tree, int stage, struct pathspec *pathspec,
+                    struct index_state *istate);
 
 #endif /* TREE_H */