From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Aug 2016 22:34:13 +0000 (-0700)
Subject: Merge branch 'rs/pull-signed-tag'
X-Git-Tag: v2.10.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aeb1b7f55d5db4eda968de5eb27f04d42df9edc1;p=thirdparty%2Fgit.git

Merge branch 'rs/pull-signed-tag'

When "git merge-recursive" works on history with many criss-cross
merges in "verbose" mode, the names the command assigns to the
virtual merge bases could have overwritten each other by unintended
reuse of the same piece of memory.

* rs/pull-signed-tag:
  commit: use FLEX_ARRAY in struct merge_remote_desc
  merge-recursive: fix verbose output for multiple base trees
  commit: factor out set_merge_remote_desc()
  commit: use xstrdup() in get_merge_parent()
---

aeb1b7f55d5db4eda968de5eb27f04d42df9edc1