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?ds=inline;hp=-c

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

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

67b5440d0dac6ee41fdd3d4c4780be48b230763e
diff --combined builtin/cat-file.c
index 750b5a24b4,5e24e811ee..31b133b357
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@@ -4,8 -4,12 +4,8 @@@
   * Copyright (C) Linus Torvalds, 2005
   */
  #include "cache.h"
 -#include "exec_cmd.h"
 -#include "tag.h"
 -#include "tree.h"
  #include "builtin.h"
  #include "parse-options.h"
 -#include "diff.h"
  #include "userdiff.h"
  #include "streaming.h"
  
@@@ -75,8 -79,6 +75,6 @@@ static int cat_one_file(int opt, const 
  		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) ||