From 58a6a9cc4397477a7d8b620165e651028cc0e3c9 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 14 Oct 2011 14:04:16 -0400 Subject: 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 --- builtin/pack-objects.c | 2 +- sha1_file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index fd40410837..c31bcd01e8 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 133aa4fe70..cad1f22002 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; -- cgit v1.2.3