Re: [PATCH v3 2/9] pack-objects: limit scope in 'add_object_entry_from_pack()'
- From
Elijah Newren <newren@gmail.com>
- Date
- Apr 16, 2025, 05:31 UTC
- Message-ID
- <CABPp-BG-=6uRtHXrzSOMw=J2Shg_vfXhLzwWDREy7OAQg_Ak6w@mail.gmail.com>
- In-Reply-To
- <986bef29b5f33d32fd366aa9370d439175a9b605.1744757204.git.me@ttaylorr.com>
On Tue, Apr 15, 2025 at 3:46 PM Taylor Blau <me@ttaylorr.com> wrote:
Show 20 quoted lines
>
> 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 <me@ttaylorr.com>
> ---
> builtin/pack-objects.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index 20dd870bbf..4ab695a3aa 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -3490,14 +3490,14 @@ static int add_object_entry_from_pack(const struct object_id *oid,
> return 0;
>
> if (p) {
> - struct rev_info *revs = _data;This change is half of what you mention in your commit message.
> struct object_info oi = OBJECT_INFO_INIT; > - > oi.typep = &type; > +
This is an unrelated, distracting change that I think was accidental and came from trying to back out the other change that was part of v1/v2 but not quite backing it out completely.
Show 5 quoted lines
> 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;This is the other half of what you mention in the commit message.
Show 5 quoted lines
> /* > * commits in included packs are used as starting points for the > * subsequent revision walk > -- > 2.49.0.230.ga662d77f78