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

Junio C Hamano committed Oct 18, 2017 at 14:19 UTC 16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b

No changes.