Merge branch 'ak/cat-file-clean-up'
commit67b5440d0dac6ee41fdd3d4c4780be48b230763e
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2015 21:46:38 +0000 (22 13:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2015 21:46:38 +0000 (22 13:46 -0800)
tree3466c36a02c1883f73f3081746fd7378754f672c
parentd588d4d9406691692c60d96e5893d49063129dab
parent331004836b3b374ce379775782367e4adf6f204a
Merge branch 'ak/cat-file-clean-up'

* ak/cat-file-clean-up:
  cat-file: use "type" and "size" from outer scope
builtin/cat-file.c