summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-space-options.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:57:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:57:49 -0700
commita5953f68186e72b3fe7b7dc0b2a7cb0f451cf3ef (patch)
treeabad8ddc1b590700b28d29973cd05fb2fd9d4894 /t/t3032-merge-recursive-space-options.sh
parentMerge branch 'ss/commit-squash-msg' into maint (diff)
parentmerge: fix NULL pointer dereference when merging nothing into void (diff)
downloadtgif-a5953f68186e72b3fe7b7dc0b2a7cb0f451cf3ef.tar.xz
Merge branch 'jv/merge-nothing-into-void' into maint
"git merge FETCH_HEAD" dereferenced NULL pointer when merging nothing into an unborn history (which is arguably unusual usage, which perhaps was the reason why nobody noticed it). * jv/merge-nothing-into-void: merge: fix NULL pointer dereference when merging nothing into void
Diffstat (limited to 't/t3032-merge-recursive-space-options.sh')
0 files changed, 0 insertions, 0 deletions