X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fpack-objects.c;h=ba3705d1de0d91714be4c967a26ffd263e09878c;hb=aface4c3904de688ced9cecad4ac07bc3afeec8f;hp=a9c67c18ba159c8f04fa6bfff52ed9718965190a;hpb=57ded055c419183e43fd7841c1f9d2e774fa96e3;p=git.git

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a9c67c18b..ba3705d1d 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -804,6 +804,10 @@ static int add_object_entry(const unsigned char *sha1, enum object_type type,
 		off_t offset = find_pack_entry_one(sha1, p);
 		if (offset) {
 			if (!found_pack) {
+				if (!is_pack_valid(p)) {
+					warning("packfile %s cannot be accessed", p->pack_name);
+					continue;
+				}
 				found_offset = offset;
 				found_pack = p;
 			}
@@ -2073,7 +2077,9 @@ static void show_commit(struct commit *commit, void *data)
 	commit->object.flags |= OBJECT_ADDED;
 }
 
-static void show_object(struct object *obj, const struct name_path *path, const char *last)
+static void show_object(struct object *obj,
+			const struct name_path *path, const char *last,
+			void *data)
 {
 	char *name = path_name(path, last);