summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-19 22:34:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-19 22:34:14 (GMT)
commitaeb1b7f55d5db4eda968de5eb27f04d42df9edc1 (patch)
treefdea1fcbbbb3837bb82b38dc0d578c46020c0c4c /builtin/checkout.c
parentd63263a4dee8fc7da9b97bbdedf9c0d1f33024d4 (diff)
parent5447a76aad4074c31e7c8a6299cc586435f385e9 (diff)
downloadgit-aeb1b7f55d5db4eda968de5eb27f04d42df9edc1.zip
git-aeb1b7f55d5db4eda968de5eb27f04d42df9edc1.tar.gz
git-aeb1b7f55d5db4eda968de5eb27f04d42df9edc1.tar.bz2
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 'builtin/checkout.c')
0 files changed, 0 insertions, 0 deletions