[PATCH] make pack-objects a bit more resilient to repo corruption
From: Nicolas Pitre <nico@fluxnic.net>
Date: 2016-06-15 22:49:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
Right now, packing valid objects could fail when creating a thin pack simply because a pack edge object used as a preferred base is corrupted. Since preferred base objects are not strictly needed to produce a valid pack, let's not consider the inability to read them as a fatal error. Delta compression may well be attempted against other objects in the search window. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> --- I wrote this patch while helping Uwe with his repo corruption. While his problem turned out to be different from the one this patch is addressing (see previous patch I posted) I think that since I did the patch already then this wouldn't hurt to have this one merged too.
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index f8eba53..674247e 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c@@ -1298,9 +1298,19 @@ 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) { + /* + * 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);