Merge branch 'kn/cat-file-literally' into next
commit04b29b561df7261008c7cfe7dd4fe1e7e024090c
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 May 2015 19:43:48 +0000 (12 12:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 May 2015 19:43:48 +0000 (12 12:43 -0700)
tree51b52472961e3eed1015d9ae3875109bddc50356
parent91e4f9ead74701a5690c950e19c8b631ee8c7a4b
parent3e370f9faf0a4e26d92ae09a26baa19330887903
Merge branch 'kn/cat-file-literally' into next

Add the "--allow-unknown-type" option to "cat-file" to allow
inspecting loose objects of an experimental or a broken type.

* kn/cat-file-literally:
  t1006: add tests for git cat-file --allow-unknown-type
  cat-file: teach cat-file a '--allow-unknown-type' option
  cat-file: make the options mutually exclusive
  sha1_file: support reading from a loose object of unknown type
cache.h
sha1_file.c