From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Jan 2015 21:46:38 +0000 (-0800)
Subject: Merge branch 'ak/cat-file-clean-up'
X-Git-Tag: v2.3.0-rc2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/67b5440d0dac6ee41fdd3d4c4780be48b230763e?hp=d588d4d9406691692c60d96e5893d49063129dab

Merge branch 'ak/cat-file-clean-up'

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

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 750b5a24b4..31b133b357 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -75,8 +75,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
 		if (type_from_string(exp_type) == OBJ_BLOB) {
 			unsigned char blob_sha1[20];
 			if (sha1_object_info(sha1, NULL) == OBJ_TAG) {
-				enum object_type type;
-				unsigned long size;
 				char *buffer = read_sha1_file(sha1, &type, &size);
 				const char *target;
 				if (!skip_prefix(buffer, "object ", &target) ||