diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-01-21 08:29:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-01-21 08:29:00 -0800 |
| commit | bc5cbbe24650f4234ed4ed2c21c58058f96dfcac (patch) | |
| tree | dac08b46bb938c4a38c40178ab3137e863aeba36 /builtin/pack-objects.c | |
| parent | d627023d80667b8975fee0a8876ac42df20bf7d2 (diff) | |
| parent | 12d3b58b5552750f351ded7166b347446d9543f3 (diff) | |
| download | git-bc5cbbe24650f4234ed4ed2c21c58058f96dfcac.tar.xz | |
Merge branch 'ps/read-object-info-improvements'
The object-info API has been cleaned up.
* ps/read-object-info-improvements:
packfile: drop repository parameter from `packed_object_info()`
packfile: skip unpacking object header for disk size requests
packfile: disentangle return value of `packed_object_info()`
packfile: always populate pack-specific info when reading object info
packfile: extend `is_delta` field to allow for "unknown" state
packfile: always declare object info to be OI_PACKED
object-file: always set OI_LOOSE when reading object info
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c342ccc95a..6ee31d48c9 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2417,7 +2417,7 @@ static void drop_reused_delta(struct object_entry *entry) oi.sizep = &size; oi.typep = &type; - if (packed_object_info(the_repository, IN_PACK(entry), entry->in_pack_offset, &oi) < 0) { + if (packed_object_info(IN_PACK(entry), entry->in_pack_offset, &oi) < 0) { /* * We failed to get the info from this pack for some reason; * fall back to odb_read_object_info, which may find another copy. @@ -3754,7 +3754,7 @@ static int add_object_entry_from_pack(const struct object_id *oid, struct object_info oi = OBJECT_INFO_INIT; oi.typep = &type; - if (packed_object_info(the_repository, p, ofs, &oi) < 0) { + if (packed_object_info(p, ofs, &oi) < 0) { die(_("could not get type of object %s in pack %s"), oid_to_hex(oid), p->pack_name); } else if (type == OBJ_COMMIT) { |