merge-recursive: do not die on a conflicting submodule

diff --git a/reachable.c b/reachable.c
index 3b1c18ff9b9060d0dd437ce89aedb8871c66c54c..b515fa2de332cc570a8a32861bd8d6491b61133e 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -48,7 +48,6 @@ static void process_tree(struct tree *tree,
        obj->flags |= SEEN;
        if (parse_tree(tree) < 0)
                die("bad tree object %s", sha1_to_hex(obj->sha1));
-       name = xstrdup(name);
        add_object(obj, p, path, name);
        me.up = path;
        me.elem = name;