setup_traverse_info(): stop copying oid

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