From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Sep 2017 05:47:53 +0000 (+0900)
Subject: Merge branch 'jk/diff-blob'
X-Git-Tag: v2.15.0-rc0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfbc2fccfdff0fe189337de67e16fc132b8ee2a5;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-blob'

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

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

bfbc2fccfdff0fe189337de67e16fc132b8ee2a5