Merge branch 'jk/diff-blob' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:01 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:01 +0000 (14:19 +0900)
commit16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b
treed139e7e06986cee72d0ab30fc758ab827770b283
parent501ec0dad31a5379ac7620f8655de882844fd3c1
parentcc0ea7c9e5c3d3bf9623415737b595c9d26b9b6d
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
builtin/cat-file.c