summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ab43e49)
raw | patch | inline | side by side (parent: ab43e49)
author | Junio C Hamano <gitster@pobox.com> | |
Sat, 25 Aug 2007 08:26:47 +0000 (01:26 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 25 Aug 2007 15:33:47 +0000 (08:33 -0700) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-pack-objects.c | patch | blob | history |
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 77481df5d6b53bc88b1a36a9461baab53026fe2d..9b3ef94c4cea6eba9d79feb5c6647deb2e149daa 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
/* Load data if not already done */
if (!trg->data) {
trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
+ if (!trg->data)
+ die("object %s cannot be read",
+ sha1_to_hex(trg_entry->idx.sha1));
if (sz != trg_size)
die("object %s inconsistent object length (%lu vs %lu)",
sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
}
if (!src->data) {
src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
+ if (!src->data)
+ die("object %s cannot be read",
+ sha1_to_hex(src_entry->idx.sha1));
if (sz != src_size)
die("object %s inconsistent object length (%lu vs %lu)",
sha1_to_hex(src_entry->idx.sha1), sz, src_size);