tree-walk: accept a raw length for traverse_path_len()

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 34ca0258b12ae4e4a04c495c244fb9c18268e7d8..0629c87b19d59d7003f50fa9524953515b409909 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -180,8 +180,8 @@ 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) + the_hash_algo->rawsz);
-       return make_traverse_path(path, info, n);
+       char *path = xmallocz(traverse_path_len(info, tree_entry_len(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)