From: Junio C Hamano Date: Wed, 18 Oct 2017 05:19:01 +0000 (+0900) Subject: Merge branch 'jk/diff-blob' into maint X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b;p=git.git 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 --- 16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b