Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tree.c17
-rw-r--r--tree.h6
2 files changed, 15 insertions, 8 deletions
diff --git a/tree.c b/tree.c
index a6c12f2745..f67c215305 100644
--- a/tree.c
+++ b/tree.c
@@ -11,10 +11,11 @@
const char *tree_type = "tree";
-static int read_tree_1(struct repository *r,
- struct tree *tree, struct strbuf *base,
- int stage, const struct pathspec *pathspec,
- read_tree_fn_t fn, void *context)
+int read_tree_at(struct repository *r,
+ struct tree *tree, struct strbuf *base,
+ int stage,
+ const struct pathspec *pathspec,
+ read_tree_fn_t fn, void *context)
{
struct tree_desc desc;
struct name_entry entry;
@@ -71,9 +72,9 @@ static int read_tree_1(struct repository *r,
len = tree_entry_len(&entry);
strbuf_add(base, entry.path, len);
strbuf_addch(base, '/');
- retval = read_tree_1(r, lookup_tree(r, &oid),
- base, stage, pathspec,
- fn, context);
+ retval = read_tree_at(r, lookup_tree(r, &oid),
+ base, stage, pathspec,
+ fn, context);
strbuf_setlen(base, oldlen);
if (retval)
return -1;
@@ -91,7 +92,7 @@ int read_tree_recursive(struct repository *r,
int ret;
strbuf_add(&sb, base, baselen);
- ret = read_tree_1(r, tree, &sb, stage, pathspec, fn, context);
+ ret = read_tree_at(r, tree, &sb, stage, pathspec, fn, context);
strbuf_release(&sb);
return ret;
}
diff --git a/tree.h b/tree.h
index 6b0b1dc211..123fc41efe 100644
--- a/tree.h
+++ b/tree.h
@@ -33,6 +33,12 @@ 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 *);
+int read_tree_at(struct repository *r,
+ struct tree *tree, struct strbuf *base,
+ int stage,
+ 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,