undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: refactor to oid_object_info_extended

Browse Source 
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>
This commit is contained in:
Jonathan Tan 2020-07-20 17:21:43 -07:00 committed by Junio C Hamano
parent cfa7ae8b6e
commit 8d5cf95735
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/pack-objects.c
View File

@ -1707,6 +1707,8 @@ static int can_reuse_delta(const struct object_id *base_oid,
static void check_object(struct object_entry *entry) static void check_object(struct object_entry *entry)
{ {
unsigned long canonical_size; unsigned long canonical_size;
enum object_type type;
struct object_info oi = {.typep = &type, .sizep = &canonical_size};
if (IN_PACK(entry)) { if (IN_PACK(entry)) {
struct packed_git *p = 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); unuse_pack(&w_curs);
} }
oe_set_type(entry, if (oid_object_info_extended(the_repository, &entry->idx.oid, &oi,
oid_object_info(the_repository, &entry->idx.oid, &canonical_size)); OBJECT_INFO_LOOKUP_REPLACE) < 0)
type = -1;
oe_set_type(entry, type);
if (entry->type_valid) { if (entry->type_valid) {
SET_SIZE(entry, canonical_size); SET_SIZE(entry, canonical_size);
} else { } else {