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>
brian m. carlson committed
Mar 12, 2018 at 02:27 UTC
d169d6644cec9bbb244c8300cadcd89afd4193cb
1 file changed
+4
-4
packfile.c
+4
-4
@@ -1095,13 +1095,13 @@ static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
1095
{
1096
int type;
1097
struct revindex_entry *revidx;
1098
- const unsigned char *sha1;
1098
+ struct object_id oid;
1099
revidx = find_pack_revindex(p, obj_offset);
1100
if (!revidx)
1101
return OBJ_BAD;
1102
- sha1 = nth_packed_object_sha1(p, revidx->nr);
1103
- mark_bad_packed_object(p, sha1);
1104
- type = sha1_object_info(sha1, NULL);
1102
+ nth_packed_object_oid(&oid, p, revidx->nr);
1103
+ mark_bad_packed_object(p, oid.hash);
1104
+ type = sha1_object_info(oid.hash, NULL);
1105
if (type <= OBJ_NONE)
1106
return OBJ_BAD;
1107
return type;