From: Junio C Hamano <junkio@cox.net>
Date: Thu, 27 Apr 2006 22:42:32 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~206
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bd346f105dc6f343eb577e4b25dbc1fa098cff33?hp=e5de2c5e308a23b8f1531bbac2f100af7ab0767b

Merge branch 'fix'

* fix:
verify-pack: check integrity in a saner order.
---

diff --git a/pack-check.c b/pack-check.c
index 84ed90d369..e57587909e 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -29,12 +29,12 @@ static int verify_packfile(struct packed_git *p)
 	pack_base = p->pack_base;
 	SHA1_Update(&ctx, pack_base, pack_size - 20);
 	SHA1_Final(sha1, &ctx);
-	if (memcmp(sha1, index_base + index_size - 40, 20))
-		return error("Packfile %s SHA1 mismatch with idx",
-			     p->pack_name);
 	if (memcmp(sha1, pack_base + pack_size - 20, 20))
 		return error("Packfile %s SHA1 mismatch with itself",
 			     p->pack_name);
+	if (memcmp(sha1, index_base + index_size - 40, 20))
+		return error("Packfile %s SHA1 mismatch with idx",
+			     p->pack_name);
 
 	/* Make sure everything reachable from idx is valid.  Since we
 	 * have verified that nr_objects matches between idx and pack,