From: Jeff King Date: Fri, 14 Oct 2011 18:04:16 +0000 (-0400) Subject: downgrade "packfile cannot be accessed" errors to warnings X-Git-Tag: v1.7.8-rc0~27^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58a6a9cc4397477a7d8b620165e651028cc0e3c9;p=git.git downgrade "packfile cannot be accessed" errors to warnings These can happen if another process simultaneously prunes a pack. But that is not usually an error condition, because a properly-running prune should have repacked the object into a new pack. So we will notice that the pack has disappeared unexpectedly, print a message, try other packs (possibly after re-scanning the list of packs), and find it in the new pack. Acked-by: Nicolas Pitre Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index fd4041083..c31bcd01e 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -805,7 +805,7 @@ static int add_object_entry(const unsigned char *sha1, enum object_type type, if (offset) { if (!found_pack) { if (!is_pack_valid(p)) { - error("packfile %s cannot be accessed", p->pack_name); + warning("packfile %s cannot be accessed", p->pack_name); continue; } found_offset = offset; diff --git a/sha1_file.c b/sha1_file.c index 133aa4fe7..cad1f2200 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2035,7 +2035,7 @@ static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e) * was loaded! */ if (!is_pack_valid(p)) { - error("packfile %s cannot be accessed", p->pack_name); + warning("packfile %s cannot be accessed", p->pack_name); goto next; } e->offset = offset;