From: Junio C Hamano <junkio@cox.net>
Date: Fri, 30 Sep 2005 07:09:04 +0000 (-0700)
Subject: Tell which packfile is corrupt when we die.
X-Git-Tag: v0.99.8~27
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=264b16b621d9996006b73786b0ccdf8b80d29c49;p=git.git

Tell which packfile is corrupt when we die.

The core part detected and died upon seeing a corrupted packfile, but
did not help the user by telling which packfile is corrupt and how.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/sha1_file.c b/sha1_file.c
index fe374c61..1e847a89 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -871,7 +871,8 @@ void packed_object_info_detail(struct pack_entry *e,
 		strcpy(type, "tag");
 		break;
 	default:
-		die("corrupted pack file");
+		die("corrupted pack file %s containing object of kind %d",
+		    p->pack_name, kind);
 	}
 	*store_size = 0; /* notyet */
 }
@@ -910,7 +911,8 @@ static int packed_object_info(struct pack_entry *entry,
 		strcpy(type, "tag");
 		break;
 	default:
-		die("corrupted pack file");
+		die("corrupted pack file %s containing object of kind %d",
+		    p->pack_name, kind);
 	}
 	if (sizep)
 		*sizep = size;
@@ -1010,7 +1012,7 @@ static void *unpack_entry(struct pack_entry *entry,
 	retval = unpack_entry_gently(entry, type, sizep);
 	unuse_packed_git(p);
 	if (!retval)
-		die("corrupted pack file");
+		die("corrupted pack file %s", p->pack_name);
 	return retval;
 }