@@ -3490,14 +3490,12 @@ static int add_object_entry_from_pack(const struct object_id *oid,
return 0;
if (p) {
- struct rev_info *revs = _data;
- struct object_info oi = OBJECT_INFO_INIT;
-
- oi.typep = &type;
+ struct object_info oi = { .typep = &type };
if (packed_object_info(the_repository, 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) {
+ struct rev_info *revs = _data;
/*
* commits in included packs are used as starting points for the
* subsequent revision walk
add_object_entry_from_pack() handles objects from identified packs by checking their type, before adding commit objects as pending in the subsequent traversal used by `--stdin-packs`. There are a couple of quality-of-life refactorings that I noticed while working in this area: - We declare 'revs' (given to us through the miscellaneous context argument) earlier in the "if (p)" conditional than is necessary. - The 'struct object_info' can use a designated initializer to fill in the structures type pointer, since that is the only field that we care about. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- builtin/pack-objects.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)