From: Taylor Blau Date: Mon, 23 Jun 2025 22:32:13 +0000 (-0400) Subject: pack-objects: limit scope in 'add_object_entry_from_pack()' X-Git-Tag: v2.51.0-rc0~55^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9809d4ae9f5b577e0afd18082b095414ce046c00;p=thirdparty%2Fgit.git pack-objects: limit scope in 'add_object_entry_from_pack()' In add_object_entry_from_pack() we declare 'revs' (given to us through the miscellaneous context argument) earlier in the "if (p)" conditional than is necessary. Move it down as far as it can go to reduce its scope. Signed-off-by: Taylor Blau Signed-off-by: Junio C Hamano --- diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index e7274e0e00..d04a36a6bf 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3725,7 +3725,6 @@ 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; @@ -3733,6 +3732,7 @@ static int add_object_entry_from_pack(const struct object_id *oid, 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