Merge branch 'jk/diff-blob'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:53 +0000 (14:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:53 +0000 (14:47 +0900)
commitbfbc2fccfdff0fe189337de67e16fc132b8ee2a5
treef08bb74506c440a64267b43675cdfcc4311fd345
parent8174645831a4b2b0722469d4f360bc97da2e2a6a
parentcc0ea7c9e5c3d3bf9623415737b595c9d26b9b6d
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
builtin/cat-file.c