From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:19:01 +0000 (+0900)
Subject: Merge branch 'jk/diff-blob' into maint
X-Git-Tag: v2.15.0-rc2~5^2~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-blob' into maint

"git cat-file --textconv" started segfaulting recently, which
has been corrected.

* jk/diff-blob:
  cat-file: handle NULL object_context.path
---

16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b