]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea7fefb b84e65d)
Merge branch 'jv/merge-nothing-into-void' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -0700)
commita5953f68186e72b3fe7b7dc0b2a7cb0f451cf3ef
treeabad8ddc1b590700b28d29973cd05fb2fd9d4894tree | snapshot
parentea7fefbd7b25deb7c0b4da56d95d67116edded48commit | diff
parentb84e65d40929ec1146f54dcf4c9dbf8dc58467d0commit | diff
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
t/t7600-merge.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.