Merge branch 'en/ort-perf-batch-9'

[thirdparty/git.git] / tree.h

diff --git a/tree.h b/tree.h
index 6b0b1dc211acf5ff5c73a9c3541b35e1062e5693..6efff003e2120e3cc5a82cda5bde904bfefa786d 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -31,11 +31,16 @@ struct tree *parse_tree_indirect(const struct object_id *oid);
 int cmp_cache_name_compare(const void *a_, const void *b_);
 
 #define READ_TREE_RECURSIVE 1
-typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, int, void *);
+typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, void *);
+
+int read_tree_at(struct repository *r,
+                struct tree *tree, struct strbuf *base,
+                const struct pathspec *pathspec,
+                read_tree_fn_t fn, void *context);
+
+int read_tree(struct repository *r,
+             struct tree *tree,
+             const struct pathspec *pathspec,
+             read_tree_fn_t fn, void *context);
 
-int read_tree_recursive(struct repository *r,
-                       struct tree *tree,
-                       const char *base, int baselen,
-                       int stage, const struct pathspec *pathspec,
-                       read_tree_fn_t fn, void *context);
 #endif /* TREE_H */