[PATCH 1/2] pack-objects: refactor to oid_object_info_extended
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Jul 21, 2020, 00:21 UTC
- Message-ID
- <1c32a00601b0cb3c48807d56fb34b10df5373e81.1595290841.git.jonathantanmy@google.com>
- In-Reply-To
- <cover.1595290841.git.jonathantanmy@google.com>
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> --- builtin/pack-objects.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 7016b28485..e09d140eed 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 {
-- 2.28.0.rc0.105.gf9edc3c819-goog