| commit | aeb1b7f55d5db4eda968de5eb27f04d42df9edc1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Aug 2016 22:34:13 +0000 (19 15:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Aug 2016 22:34:14 +0000 (19 15:34 -0700) | ||
| tree | fdea1fcbbbb3837bb82b38dc0d578c46020c0c4c | treesnapshot (tar.gz zip) |
| parent | d63263a4dee8fc7da9b97bbdedf9c0d1f33024d4 | commitdiff |
| parent | 5447a76aad4074c31e7c8a6299cc586435f385e9 | commitdiff |
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()
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()
| commit.c | diff1 | diff2 | blobhistory |
| commit.h | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |