git-merge-one-file: do not worry about 'rmdir -p' not removing directory.

diff --git a/tree.h b/tree.h
index ae61bcca6e32b176c0499a8ffc9d5af619b31058..768e5e9eb894d37c0dca452bc7d96a1271035b55 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -14,6 +14,7 @@ struct tree_entry_list {
        unsigned int mode;
        char *name;
        union {
+               struct object *any;
                struct tree *tree;
                struct blob *blob;
        } item;
@@ -31,4 +32,16 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
 
 int parse_tree(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);
+
+#define READ_TREE_RECURSIVE 1
+typedef int (*read_tree_fn_t)(unsigned char *, const char *, int, const char *, unsigned int, int);
+
+extern int read_tree_recursive(void *buffer, unsigned long size,
+                       const char *base, int baselen,
+                       int stage, const char **match,
+                       read_tree_fn_t fn);
+
+
 #endif /* TREE_H */