Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] read-cache: use istate->repo in overlay_tree_on_index()
Date: Mon, 16 Nov 2026 08:51:35 -0800	[thread overview]
Message-ID: <xmqqtslglnxk.fsf@gitster.g> (raw)
In-Reply-To: <b7abaeba-1dd9-45f3-ad63-e43c49ee48d4@gmail.com> (Derrick Stolee's message of "Mon, 16 Nov 2026 08:11:33 -0500")

Derrick Stolee <stolee@gmail.com> writes:

> On 11/16/2026 5:34 AM, Srujith A Poojary via GitGitGadget wrote:
>> From: Srujith A Poojary <poojarysrujith@gmail.com>
>> 
>> Use the repository associated with the index state when
>> resolving the tree name, parsing the tree, and reading
>> its entries.
>> 
>> This avoids relying on the global repository when the
>> function already has access to its associated repository.
>
> Cleanups are good.

At least this one is not making things any worse.

But there are other functions in this file, like add_to_index() and
refresh_index(), that take istate but still mention the_repository.
Cleaning these functions that share the same issue together in a
single patch would help us reduce the review load and patch churn.

On the other hand, I do not think it is a good idea to try losing
USE_THE_REPOSITORY from this file all at once.  There are many
lower-level functions that do not take istate (or repo), and it
needs a design based on deeper thinking (which has not been made
here for the obvious reason of not needing one yet) to decide what
to do with them [*].  We do not want to see such changes in the same
series of patches as a mechanical replacement patch like this one.

Thanks.


[Footnote]

 * Passing an extra parameter, either repo or istate, to these
   functions may be an easy way, but the overhead may make it a
   less-than-optimal solution, for example.  Teaching ce which
   istate it belongs to is an absolute no-no, as these things are
   born without their own istate, and are transfered between
   different istates; besides they are so numerous.  Those are
   merely one or two examples that need to be considered before we
   know what the right approach is.


>> +	struct repository *repo = istate->repo;
>
>> -	if (repo_get_oid(the_repository, tree_name, &oid))
>> +	if (repo_get_oid(repo, tree_name, &oid))
>
>> -	tree = repo_parse_tree_indirect(the_repository, &oid);
>> +	tree = repo_parse_tree_indirect(repo, &oid);
>
>> -	err = read_tree(the_repository, tree, &pathspec, fn, istate);
>> +	err = read_tree(repo, tree, &pathspec, fn, istate);
> The only other way to do this would be to replace the_repository
> with 'istate->repo' directly, but having a 'repo' variable is
> just as good.
>
> LGTM.
> -Stolee

      reply	other threads:[~2026-11-16 16:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 10:34 [PATCH] read-cache: use istate->repo in overlay_tree_on_index() Srujith A Poojary via GitGitGadget
2026-11-16 13:11 ` Derrick Stolee
2026-11-16 16:51   ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtslglnxk.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=stolee@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox