diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-19 15:34:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-19 15:34:14 -0700 |
| commit | aeb1b7f55d5db4eda968de5eb27f04d42df9edc1 (patch) | |
| tree | fdea1fcbbbb3837bb82b38dc0d578c46020c0c4c /object.h | |
| parent | RelNotes: final batch of topics before -rc1 (diff) | |
| parent | commit: use FLEX_ARRAY in struct merge_remote_desc (diff) | |
| download | tgif-aeb1b7f55d5db4eda968de5eb27f04d42df9edc1.tar.xz | |
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()
Diffstat (limited to 'object.h')
0 files changed, 0 insertions, 0 deletions