]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a6822e4 b84e65d)
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)
commitaad627e3c0e7dcf5a59da80cb424e8a4093b0324
tree6de618e5e855a985e42e6020eff41c59123699e1tree | snapshot
parenta6822e4172a8fa889b10a7a363088d2a05932b9bcommit | diff
parentb84e65d40929ec1146f54dcf4c9dbf8dc58467d0commit | diff
Merge branch 'jv/merge-nothing-into-void'

"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
builtin/merge.c diff1 | diff2 | blob | history
t/t7600-merge.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.