Skip to content

Commit

Permalink
Merge branch 'ak/cat-file-clean-up'
Browse files Browse the repository at this point in the history
* ak/cat-file-clean-up:
  cat-file: use "type" and "size" from outer scope
  • Loading branch information
Junio C Hamano committed Jan 22, 2015
2 parents d588d4d + 3310048 commit 67b5440
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions builtin/cat-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) ||
Expand Down

0 comments on commit 67b5440

Please sign in to comment.