Andrew's git / gitweb.git / diff
?
Merge branch 'jv/merge-nothing-into-void'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:11 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:11 +0000 (11:39 -0700)
"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

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history
t/t7600-merge.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/merge.c
Simple merge
diff --cc t/t7600-merge.sh
Simple merge