merge-recursive: fix verbose output for multiple base trees
commita25716535ba7ba85322a1e9f20168f31c61dae81
authorRené Scharfe <l.s.r@web.de>
Sat, 13 Aug 2016 12:16:04 +0000 (13 14:16 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2016 02:48:04 +0000 (13 19:48 -0700)
treebcb90b2aa499ce40ea2b1e0702531e6ae517c9ff
parentbeb518c9850f459a71a2cb9e1d36e677528a55c0
merge-recursive: fix verbose output for multiple base trees

One of the indirect callers of make_virtual_commit() passes the result of
oid_to_hex() as the name, i.e. a pointer to a static buffer.  Since the
function uses that string pointer directly in building a struct
merge_remote_desc, multiple entries can end up sharing the same name
inadvertently.

Fix that by calling set_merge_remote_desc(), which creates a copy of the
string, instead of building the struct by hand.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t3030-merge-recursive.sh