summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-10-14 14:04:16 -0400
committerJunio C Hamano <gitster@pobox.com>2011-10-14 11:43:09 -0700
commit58a6a9cc4397477a7d8b620165e651028cc0e3c9 (patch)
tree79ecdaf8e79365abee1b8ea2342b656ba7a5aafc /sha1_file.c
parent4c08018204f95c492c0ad7b033b8f57ccc2e43f5 (diff)
downloadgit-58a6a9cc4397477a7d8b620165e651028cc0e3c9.tar.gz
downgrade "packfile cannot be accessed" errors to warningsjk/maint-pack-objects-compete-with-delete
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 <nico@fluxnic.net> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c2
1 files changed, 1 insertions, 1 deletions
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;