Merge branch 'cp/textconv-cat-file' (early part) into next
commiteb6f21611e553cb1cc86c116fbd2ee4cb9dd3acb
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Jun 2010 18:41:05 +0000 (23 11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Jun 2010 18:41:05 +0000 (23 11:41 -0700)
tree6a0d79528cc088408b715a46efd9427856c6e53e
parenta7da5af2c98af31b8f6672b67324c1fba237c6a8
parent34bb92eca4259b3db8cb9bfad5fcac4ff2be139b
Merge branch 'cp/textconv-cat-file' (early part) into next

* 'cp/textconv-cat-file' (early part):
  t/t8007: test textconv support for cat-file
  textconv: support for cat_file
  sha1_name: add get_sha1_with_context()
builtin.h
builtin/blame.c
builtin/cat-file.c
cache.h
sha1_name.c