Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ak/cat-file-clean-up'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Jan 2015 21:46:38 +0000
(13:46 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Jan 2015 21:46:38 +0000
(13:46 -0800)
* ak/cat-file-clean-up:
cat-file: use "type" and "size" from outer scope
builtin/cat-file.c
patch
|
blob
|
history
raw
(from parent 1:
d588d4d
)
diff --git
a/builtin/cat-file.c
b/builtin/cat-file.c
index 750b5a24b4e7c1781adde09ac2717f7cbf02b872..31b133b357f34e9bc0a63dec5ce2dbceba43e765 100644
(file)
--- 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) ||