summaryrefslogtreecommitdiff
path: root/pack-objects.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-06-20 07:41:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-20 16:54:58 (GMT)
commit3df28caefb2193fb7bbc87a427a620d96d508c8d (patch)
treebcc54fc93d166a61c7a7289565d861173a85aaf0 /pack-objects.h
parent05805d7411a78b606c4bca2f0288fd842df6addd (diff)
downloadgit-3df28caefb2193fb7bbc87a427a620d96d508c8d.zip
git-3df28caefb2193fb7bbc87a427a620d96d508c8d.tar.gz
git-3df28caefb2193fb7bbc87a427a620d96d508c8d.tar.bz2
pack-objects: convert packlist_find() to use object_id
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>
Diffstat (limited to 'pack-objects.h')
-rw-r--r--pack-objects.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-objects.h b/pack-objects.h
index 6fde7ce..857d438 100644
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -187,7 +187,7 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
uint32_t index_pos);
struct object_entry *packlist_find(struct packing_data *pdata,
- const unsigned char *sha1,
+ const struct object_id *oid,
uint32_t *index_pos);
static inline uint32_t pack_name_hash(const char *name)