Merge branch 'ab/read-tree'

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index b69e694d986ac8f0a3e5f13f35ef81da474dade9..ed31f9496cbcb2e71f41fde922075dc2684c70f2 100644 (file)
--- 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,