undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* ak/cat-file-clean-up:
  cat-file: use "type" and "size" from outer scope
This commit is contained in:
Junio C Hamano 2015-01-22 13:46:38 -08:00
commit 67b5440d0d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/cat-file.c
View File

@ -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) { if (type_from_string(exp_type) == OBJ_BLOB) {
unsigned char blob_sha1[20]; unsigned char blob_sha1[20];
if (sha1_object_info(sha1, NULL) == OBJ_TAG) { if (sha1_object_info(sha1, NULL) == OBJ_TAG) {
enum object_type type;
unsigned long size;
char *buffer = read_sha1_file(sha1, &type, &size); char *buffer = read_sha1_file(sha1, &type, &size);
const char *target; const char *target;
if (!skip_prefix(buffer, "object ", &target) || if (!skip_prefix(buffer, "object ", &target) ||