summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-30 21:35:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-30 21:35:37 (GMT)
commitad16f748f22c82d096664f15f1a1c7fcc361cfe3 (patch)
treee3ea426b9f96290914bc4cf22da10b1c3e6a0ce1 /merge-recursive.c
parentaab55b1d6e1541f70ff364ce7b2c98f6a8157084 (diff)
parent47957485b3b731a7860e0554d2bd12c0dce1c75a (diff)
downloadgit-ad16f748f22c82d096664f15f1a1c7fcc361cfe3.zip
git-ad16f748f22c82d096664f15f1a1c7fcc361cfe3.tar.gz
git-ad16f748f22c82d096664f15f1a1c7fcc361cfe3.tar.bz2
Merge branch 'ab/read-tree'
Code simplification by removing support for a caller that is long gone. * ab/read-tree: tree.h API: simplify read_tree_recursive() signature tree.h API: expose read_tree_1() as read_tree_at() archive: stop passing "stage" through read_tree_recursive() ls-files: refactor away read_tree() ls-files: don't needlessly pass around stage variable tree.c API: move read_tree() into builtin/ls-files.c ls-files tests: add meaningful --with-tree tests show tests: add test for "git show <tree>"
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index b69e694..ed31f94 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -453,7 +453,7 @@ static void unpack_trees_finish(struct merge_options *opt)
static int save_files_dirs(const struct object_id *oid,
struct strbuf *base, const char *path,
- unsigned int mode, int stage, void *context)
+ unsigned int mode, void *context)
{
struct path_hashmap_entry *entry;
int baselen = base->len;
@@ -473,8 +473,8 @@ static void get_files_dirs(struct merge_options *opt, struct tree *tree)
{
struct pathspec match_all;
memset(&match_all, 0, sizeof(match_all));
- read_tree_recursive(opt->repo, tree, "", 0, 0,
- &match_all, save_files_dirs, opt);
+ read_tree(opt->repo, tree,
+ &match_all, save_files_dirs, opt);
}
static int get_tree_entry_if_blob(struct repository *r,