Merge branch 'jk/type-from-string-gently' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:54 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:54 +0000 (14:05 -0700)
"git cat-file bl $blob" failed to barf even though there is no
object type that is "bl".

* jk/type-from-string-gently:
type_from_string_gently: make sure length matches

1  2 
object.c
diff --cc object.c
Simple merge