summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-22 13:46:38 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-22 13:46:38 -0800
commit67b5440d0dac6ee41fdd3d4c4780be48b230763e (patch)
tree3466c36a02c1883f73f3081746fd7378754f672c
parentd588d4d9406691692c60d96e5893d49063129dab (diff)
parent331004836b3b374ce379775782367e4adf6f204a (diff)
downloadgit-67b5440d0dac6ee41fdd3d4c4780be48b230763e.tar.gz
Merge branch 'ak/cat-file-clean-up'
* ak/cat-file-clean-up: cat-file: use "type" and "size" from outer scope
-rw-r--r--builtin/cat-file.c2
1 files changed, 0 insertions, 2 deletions
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) ||