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/cat-file.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/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 3cb725940d..df8e87a81f 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -487,8 +487,7 @@ static void batch_object_write(const char *obj_name, data->info.sizep = &data->size; if (pack) - ret = packed_object_info(the_repository, pack, - offset, &data->info); + ret = packed_object_info(pack, offset, &data->info); else ret = odb_read_object_info_extended(the_repository->objects, &data->oid, &data->info, |