]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 501ec0d cc0ea7c)
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)
"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 patch | diff1 | diff2 | blob | history

diff --cc builtin/cat-file.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.