summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2016-08-13 14:16:04 +0200
committerJunio C Hamano <gitster@pobox.com>2016-08-13 19:48:04 -0700
commita25716535ba7ba85322a1e9f20168f31c61dae81 (patch)
treebcb90b2aa499ce40ea2b1e0702531e6ae517c9ff /commit.c
parentbeb518c9850f459a71a2cb9e1d36e677528a55c0 (diff)
downloadgit-a25716535ba7ba85322a1e9f20168f31c61dae81.tar.gz
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions