summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-09 10:36:39 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-09 10:36:39 -0800
commit8577def6fc1dda3f18a284162aba07819fbcbcd4 (patch)
tree8673e563e044c1faeead872c365a7f9a1582e8d9 /diff.c
parenta59c87265b917eb0d1b95c73ed829d47ee2ded6b (diff)
parentc50c4316e1eed362bee387e4cbfbe1138957f75b (diff)
downloadgit-8577def6fc1dda3f18a284162aba07819fbcbcd4.tar.gz
Merge branch 'np/diff-in-corrupt-repository' into maint
* np/diff-in-corrupt-repository: diff: don't presume empty file when corresponding object is missing
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index c8a7ceea02..8256f313e4 100644
--- a/diff.c
+++ b/diff.c
@@ -2391,10 +2391,14 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
}
else {
enum object_type type;
- if (size_only)
+ if (size_only) {
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);
+ if (!s->data)
+ die("unable to read %s", sha1_to_hex(s->sha1));
s->should_free = 1;
}
}