Repository navigation
read-cache: use istate->repo in overlay_tree_on_index() - #2315
Open
poojarysrujith wants to merge 1 commit into
Open
poojarysrujith wants to merge 1 commit into
poojarysrujith wants to merge 1 commit into
Conversation
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. Signed-off-by: Srujith A Poojary <poojarysrujith@gmail.com>
Author
|
/preview |
|
Preview email sent as pull.2315.git.1794824970596.gitgitgadget@gmail.com |
Author
|
/submit |
|
Submitted as pull.2315.git.1794825269464.gitgitgadget@gmail.com To fetch this version into To fetch this version to local tag |
|
Derrick Stolee wrote on the Git mailing list (how to reply to this email): 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.
> + 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
|
|
User |
|
Junio C Hamano wrote on the Git mailing list (how to reply to this email): 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cc: Derrick Stolee stolee@gmail.com