From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Apr 2016 18:39:11 +0000 (-0700)
Subject: Merge branch 'jv/merge-nothing-into-void'
X-Git-Tag: v2.9.0-rc0~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aad627e3c0e7dcf5a59da80cb424e8a4093b0324;p=git

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
---

aad627e3c0e7dcf5a59da80cb424e8a4093b0324