mirror of
https://github.com/git/git.git
synced 2026-03-03 12:57:59 +01:00
Merge branch 'ps/read-object-info-improvements' into ps/odb-for-each-object
* 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
This commit is contained in:
@@ -1493,7 +1493,7 @@ static int add_packed_commits(const struct object_id *oid,
|
||||
display_progress(ctx->progress, ++ctx->progress_done);
|
||||
|
||||
oi.typep = &type;
|
||||
if (packed_object_info(ctx->r, pack, offset, &oi) < 0)
|
||||
if (packed_object_info(pack, offset, &oi) < 0)
|
||||
die(_("unable to get type of object %s"), oid_to_hex(oid));
|
||||
|
||||
if (type != OBJ_COMMIT)
|
||||
|
||||
Reference in New Issue
Block a user