From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Mon, 12 Mar 2018 02:27:43 +0000 (+0000)
Subject: sha1_file: convert retry_bad_packed_offset to struct object_id
X-Git-Tag: v2.18.0-rc0~163^2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d169d6644cec9bbb244c8300cadcd89afd4193cb?hp=--cc

sha1_file: convert retry_bad_packed_offset to struct object_id

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

d169d6644cec9bbb244c8300cadcd89afd4193cb
diff --git a/packfile.c b/packfile.c
index 7c1a2519fc..5f08aa0a14 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1095,13 +1095,13 @@ static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
 {
 	int type;
 	struct revindex_entry *revidx;
-	const unsigned char *sha1;
+	struct object_id oid;
 	revidx = find_pack_revindex(p, obj_offset);
 	if (!revidx)
 		return OBJ_BAD;
-	sha1 = nth_packed_object_sha1(p, revidx->nr);
-	mark_bad_packed_object(p, sha1);
-	type = sha1_object_info(sha1, NULL);
+	nth_packed_object_oid(&oid, p, revidx->nr);
+	mark_bad_packed_object(p, oid.hash);
+	type = sha1_object_info(oid.hash, NULL);
 	if (type <= OBJ_NONE)
 		return OBJ_BAD;
 	return type;