Merge branch 'jk/cat-file-regression-fix' into maint
commit6845e8a62dca508819e9a95b9269054de8c7eda8
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jan 2014 19:22:21 +0000 (13 11:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jan 2014 19:22:21 +0000 (13 11:22 -0800)
tree3366596d645ff95ceb25bc3025fa1a83cad4b361
parentebba6c0ca617352ceef5caa636ab243f0ef14cc3
parent6554dfa97af92a159231d94e60403bfe0d6e8e61
Merge branch 'jk/cat-file-regression-fix' into maint

"git cat-file --batch=", an admittedly useless command, did not
behave very well.

* jk/cat-file-regression-fix:
  cat-file: handle --batch format with missing type/size
  cat-file: pass expand_data to print_object_or_die
t/t1006-cat-file.sh