summaryrefslogtreecommitdiff
path: root/editor.c
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2016-08-13 14:16:04 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-13 19:48:04 -0700
commita25716535ba7ba85322a1e9f20168f31c61dae81 (patch)
treebcb90b2aa499ce40ea2b1e0702531e6ae517c9ff /editor.c
parentcommit: factor out set_merge_remote_desc() (diff)
downloadtgif-a25716535ba7ba85322a1e9f20168f31c61dae81.tar.xz
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 'editor.c')
0 files changed, 0 insertions, 0 deletions