mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1_file: convert retry_bad_packed_offset to struct object_id

Browse Source 
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2018-03-12 02:27:43 +00:00
committed by Junio C Hamano
parent e816caa07b
commit d169d6644c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packfile.c
View File

@ -1095,13 +1095,13 @@ static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
{ {
int type; int type;
struct revindex_entry *revidx; struct revindex_entry *revidx;
const unsigned char *sha1; struct object_id oid;
revidx = find_pack_revindex(p, obj_offset); revidx = find_pack_revindex(p, obj_offset);
if (!revidx) if (!revidx)
return OBJ_BAD; return OBJ_BAD;
sha1 = nth_packed_object_sha1(p, revidx->nr); nth_packed_object_oid(&oid, p, revidx->nr);
mark_bad_packed_object(p, sha1); mark_bad_packed_object(p, oid.hash);
type = sha1_object_info(sha1, NULL); type = sha1_object_info(oid.hash, NULL);
if (type <= OBJ_NONE) if (type <= OBJ_NONE)
return OBJ_BAD; return OBJ_BAD;
return type; return type;