From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:57:49 +0000 (-0700)
Subject: Merge branch 'jv/merge-nothing-into-void' into maint
X-Git-Tag: v2.8.2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5953f68186e72b3fe7b7dc0b2a7cb0f451cf3ef;p=git

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

a5953f68186e72b3fe7b7dc0b2a7cb0f451cf3ef