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

Merge branch 'np/diff-in-corrupt-repository'

Browse Source 
* np/diff-in-corrupt-repository:
  diff: don't presume empty file when corresponding object is missing
This commit is contained in:
Junio C Hamano 2010-11-29 17:52:33 -08:00
commit f5a5531e4e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
diff.c
View File

@ -2391,10 +2391,14 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
} }
else { else {
enum object_type type; enum object_type type;
if (size_only) if (size_only) {
type = sha1_object_info(s->sha1, &s->size); type = sha1_object_info(s->sha1, &s->size);
else { if (type < 0)
die("unable to read %s", sha1_to_hex(s->sha1));
} else {
s->data = read_sha1_file(s->sha1, &type, &s->size); s->data = read_sha1_file(s->sha1, &type, &s->size);
if (!s->data)
die("unable to read %s", sha1_to_hex(s->sha1));
s->should_free = 1; s->should_free = 1;
} }
} }