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)
"git cat-file --textconv" started segfaulting recently, which
has been corrected.

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

1  2 
builtin/cat-file.c

Simple merge