| commit | 69307312d1bee69d33151cee8ed5940c46d7ee39 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Sep 2016 04:35:54 +0000 (8 21:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Sep 2016 04:35:54 +0000 (8 21:35 -0700) | ||
| tree | 8c7ed3be35ac5d44c394c8e1aa2234265464849e | treesnapshot (tar.gz zip) |
| parent | 86df11b1a46dd9c3e383b02d21f17d9329aff6e0 | commitdiff |
| parent | 5447a76aad4074c31e7c8a6299cc586435f385e9 | commitdiff |
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()
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()
| merge-recursive.c | diff1 | diff2 | blobhistory |