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

pack-objects: convert packlist_find() to use object_id

Browse Source 
We take a raw hash pointer, but most of our callers have a "struct
object_id" already. Let's switch to taking the full struct, which will
let us continue removing uses of raw sha1 buffers.

There are two callers that do need special attention:

  - in rebuild_existing_bitmaps(), we need to switch to
    nth_packed_object_oid(). This incurs an extra hash copy over
    pointing straight to the mmap'd sha1, but it shouldn't be measurable
    compared to the rest of the operation.

  - in can_reuse_delta() we already spent the effort to copy the sha1
    into a "struct object_id", but now we just have to do so a little
    earlier in the function (we can't easily convert that function's
    callers because they may be pointing at mmap'd REF_DELTA blocks).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2019-06-20 03:41:03 -04:00
committed by Junio C Hamano
parent 05805d7411
commit 3df28caefb
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pack-objects.c
View File

@ -68,7 +68,7 @@ static void rehash_objects(struct packing_data *pdata)
}
struct object_entry *packlist_find(struct packing_data *pdata,
const unsigned char *sha1,
const struct object_id *oid,
uint32_t *index_pos)
{
uint32_t i;
@ -77,7 +77,7 @@ struct object_entry *packlist_find(struct packing_data *pdata,
if (!pdata->index_size)
return NULL;
i = locate_object_entry_hash(pdata, sha1, &found);
i = locate_object_entry_hash(pdata, oid->hash, &found);
if (index_pos)
*index_pos = i;