summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2019-06-20 03:41:10 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-20 10:06:19 -0700
commit0ebbcf70e672ef9ad46eb4975a34d3639190aeb2 (patch)
treea12303cc5e438a049ba51eecdbfac515139156d2 /builtin/pack-objects.c
parentpack-objects: convert locate_object_entry_hash() to object_id (diff)
downloadtgif-0ebbcf70e672ef9ad46eb4975a34d3639190aeb2.tar.xz
object: convert lookup_unknown_object() to use object_id
There are no callers left of lookup_unknown_object() that aren't just passing us the "hash" member of a "struct object_id". Let's take the whole struct, which gets us closer to removing all raw sha1 variables. It also matches the existing conversions of lookup_blob(), etc. The conversions of callers were done by hand, but they're all mechanical one-liners. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r--builtin/pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c95693fd4b..3e8467aa23 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2923,7 +2923,7 @@ static void add_objects_in_unpacked_packs(void)
for (i = 0; i < p->num_objects; i++) {
nth_packed_object_oid(&oid, p, i);
- o = lookup_unknown_object(oid.hash);
+ o = lookup_unknown_object(&oid);
if (!(o->flags & OBJECT_ADDED))
mark_in_pack_object(o, p, &in_pack);
o->flags |= OBJECT_ADDED;