diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:36:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:36:23 -0800 |
| commit | 5605685a71bd65548dab56e457b15d365b4350b4 (patch) | |
| tree | 5645eb2a1143db7f48e4b9b4a2a3294d87209ee3 /builtin | |
| parent | ded4dfd5196a007a6e56da1821a3a00292242a53 (diff) | |
| parent | 71064a956b25ef519eab340e364d0bc0e786bd11 (diff) | |
| download | git-5605685a71bd65548dab56e457b15d365b4350b4.tar.gz git-5605685a71bd65548dab56e457b15d365b4350b4.tar.xz | |
Merge branch 'np/pack-broken-boundary' into maint
* np/pack-broken-boundary:
make pack-objects a bit more resilient to repo corruption
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pack-objects.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index f8eba53c8..3cbeb299d 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1298,9 +1298,23 @@ static int try_delta(struct unpacked *trg, struct unpacked *src, read_lock(); src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz); read_unlock(); - if (!src->data) + if (!src->data) { + if (src_entry->preferred_base) { + static int warned = 0; + if (!warned++) + warning("object %s cannot be read", + sha1_to_hex(src_entry->idx.sha1)); + /* + * Those objects are not included in the + * resulting pack. Be resilient and ignore + * them if they can't be read, in case the + * pack could be created nevertheless. + */ + return 0; + } 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); |