mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  cat-file: Fix an gcc -Wuninitialized warning
  fast-import: Fix an gcc -Wuninitialized warning
This commit is contained in:
Junio C Hamano
2013-03-31 19:27:54 -07:00
parent 631bc94e67 803a777942
commit a32a0c29df
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/cat-file.c
View File

@ -193,7 +193,7 @@ static int batch_one_object(const char *obj_name, int print_contents)
unsigned char sha1[20]; unsigned char sha1[20];
enum object_type type = 0; enum object_type type = 0;
unsigned long size; unsigned long size;
void *contents; void *contents = NULL;
if (!obj_name) if (!obj_name)
return 1; return 1;

1
fast-import.c
View File

@ -2465,6 +2465,7 @@ static void note_change_n(struct branch *b, unsigned char *old_fanout)
hashcpy(sha1, oe->idx.sha1); hashcpy(sha1, oe->idx.sha1);
} else if (!prefixcmp(p, "inline ")) { } else if (!prefixcmp(p, "inline ")) {
inline_data = 1; inline_data = 1;
oe = NULL; /* not used with inline_data, but makes gcc happy */
p += strlen("inline"); /* advance to space */ p += strlen("inline"); /* advance to space */
} else { } else {
if (get_sha1_hex(p, sha1)) if (get_sha1_hex(p, sha1))