From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Sep 2016 04:35:54 +0000 (-0700)
Subject: Merge branch 'rs/pull-signed-tag' into maint
X-Git-Tag: v2.10.1~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69307312d1bee69d33151cee8ed5940c46d7ee39;p=thirdparty%2Fgit.git

Merge branch 'rs/pull-signed-tag' into maint

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()
---

69307312d1bee69d33151cee8ed5940c46d7ee39