tree-walk: drop oid from traverse_info

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 8ac62708366f23af79850a12f463f670474a38c2..f0e4cfefaaf5c450f70b0afc5f1eda5636ec405e 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -181,7 +181,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru
 static char *traverse_path(const struct traverse_info *info, const struct name_entry *n)
 {
        char *path = xmallocz(traverse_path_len(info, n));
-       return make_traverse_path(path, info, n);
+       return make_traverse_path(path, info, n->path, n->pathlen);
 }
 
 static void resolve(const struct traverse_info *info, struct name_entry *ours, struct name_entry *result)