git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea7fefb b84e65d)
Merge branch 'jv/merge-nothing-into-void' into maint
authorJunio C Hamano <redacted>
Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -0700)
committerJunio C Hamano <redacted>
Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -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 
t/t7600-merge.sh patch | diff1 | diff2 | blob | history

diff --cc t/t7600-merge.sh
Simple merge
git clone https://git.99rst.org/PROJECT