diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2020-07-21 03:21:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-22 00:29:42 +0300 |
| commit | 8d5cf957352badca4575cc85c020d6cf73db86f7 (patch) | |
| tree | f885443fcf3213557a24a6d74d4629f1688dd8f9 /builtin/pack-objects.c | |
| parent | cfa7ae8b6e2f375d3609e526754539ef0791d33b (diff) | |
pack-objects: refactor to oid_object_info_extended
Use oid_object_info_extended() instead of oid_object_info() because a
subsequent commit needs to specify an additional flag here.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 7016b28485b..e09d140eed4 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1707,6 +1707,8 @@ static int can_reuse_delta(const struct object_id *base_oid, static void check_object(struct object_entry *entry) { unsigned long canonical_size; + enum object_type type; + struct object_info oi = {.typep = &type, .sizep = &canonical_size}; if (IN_PACK(entry)) { struct packed_git *p = IN_PACK(entry); @@ -1840,8 +1842,10 @@ static void check_object(struct object_entry *entry) unuse_pack(&w_curs); } - oe_set_type(entry, - oid_object_info(the_repository, &entry->idx.oid, &canonical_size)); + if (oid_object_info_extended(the_repository, &entry->idx.oid, &oi, + OBJECT_INFO_LOOKUP_REPLACE) < 0) + type = -1; + oe_set_type(entry, type); if (entry->type_valid) { SET_SIZE(entry, canonical_size); } else { |