All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Srujith A Poojary via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Derrick Stolee <stolee@gmail.com>,
	Srujith A Poojary <poojarysrujith@gmail.com>,
	Srujith A Poojary <poojarysrujith@gmail.com>
Subject: [PATCH v2] read-cache: use istate->repo in index operations
Date: Wed, 18 Nov 2026 18:45:23 +0000	[thread overview]
Message-ID: <pull.2315.v2.git.1795027523258.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2315.git.1794825269464.gitgitgadget@gmail.com>

From: Srujith A Poojary <poojarysrujith@gmail.com>

Use the repository associated with the index state in
add_to_index(), refresh_index(), and overlay_tree_on_index.

These functions already receive an index state, so use its
repository instead of relying on the global repository for
repository-specific configuration, progress reporting, and
tree operations.

This removes unnecessary dependencies on the global repository
from these code paths.

Signed-off-by: Srujith A Poojary <poojarysrujith@gmail.com>
---
    read-cache: use istate->repo in index operations

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2315%2Fpoojarysrujith%2Flibification-overlay-tree-repo-clean-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2315/poojarysrujith/libification-overlay-tree-repo-clean-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/2315

Range-diff vs v1:

 1:  6eabf019e9 ! 1:  19ab253b22 read-cache: use istate->repo in overlay_tree_on_index()
     @@ Metadata
      Author: Srujith A Poojary <poojarysrujith@gmail.com>
      
       ## Commit message ##
     -    read-cache: use istate->repo in overlay_tree_on_index()
     +    read-cache: use istate->repo in index operations
      
     -    Use the repository associated with the index state when
     -    resolving the tree name, parsing the tree, and reading
     -    its entries.
     +    Use the repository associated with the index state in
     +    add_to_index(), refresh_index(), and overlay_tree_on_index.
      
     -    This avoids relying on the global repository when the
     -    function already has access to its associated repository.
     +    These functions already receive an index state, so use its
     +    repository instead of relying on the global repository for
     +    repository-specific configuration, progress reporting, and
     +    tree operations.
     +
     +    This removes unnecessary dependencies on the global repository
     +    from these code paths.
      
          Signed-off-by: Srujith A Poojary <poojarysrujith@gmail.com>
      
       ## read-cache.c ##
     +@@ read-cache.c: int add_to_index(struct index_state *istate, const char *path, struct stat *st,
     + 	 * case of the file being added to the repository matches (is folded into) the existing
     + 	 * entry's directory case.
     + 	 */
     +-	if (repo_ignore_case(the_repository)) {
     ++	if (repo_ignore_case(istate->repo)) {
     + 		adjust_dirname_case(istate, ce->name);
     + 	}
     + 	if (!(flags & ADD_CACHE_RENORMALIZE)) {
     + 		alias = index_file_exists(istate, ce->name,
     +-					  ce_namelen(ce), repo_ignore_case(the_repository));
     ++					  ce_namelen(ce), repo_ignore_case(istate->repo));
     + 		if (alias &&
     + 		    !ce_stage(alias) &&
     + 		    !ie_match_stat(istate, alias, st, ce_option)) {
     +@@ read-cache.c: int add_to_index(struct index_state *istate, const char *path, struct stat *st,
     + 	} else
     + 		set_object_name_for_intent_to_add_entry(ce);
     + 
     +-	if (repo_ignore_case(the_repository) && alias && different_name(ce, alias))
     ++	if (repo_ignore_case(istate->repo) && alias && different_name(ce, alias))
     + 		ce = create_alias_ce(istate, ce, alias);
     + 	ce->ce_flags |= CE_ADDED;
     + 
     +@@ read-cache.c: int refresh_index(struct index_state *istate, unsigned int flags,
     + 	int t2_sum_scan = 0;
     + 
     + 	if (flags & REFRESH_PROGRESS && isatty(2))
     +-		progress = start_delayed_progress(the_repository,
     ++		progress = start_delayed_progress(istate->repo,
     + 						  _("Refresh index"),
     + 						  istate->cache_nr);
     + 
      @@ read-cache.c: static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base
       void overlay_tree_on_index(struct index_state *istate,
       			   const char *tree_name, const char *prefix)


 read-cache.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/read-cache.c b/read-cache.c
index 5bbfbfeceb..5ca2561e7a 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -908,12 +908,12 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
 	 * case of the file being added to the repository matches (is folded into) the existing
 	 * entry's directory case.
 	 */
-	if (repo_ignore_case(the_repository)) {
+	if (repo_ignore_case(istate->repo)) {
 		adjust_dirname_case(istate, ce->name);
 	}
 	if (!(flags & ADD_CACHE_RENORMALIZE)) {
 		alias = index_file_exists(istate, ce->name,
-					  ce_namelen(ce), repo_ignore_case(the_repository));
+					  ce_namelen(ce), repo_ignore_case(istate->repo));
 		if (alias &&
 		    !ce_stage(alias) &&
 		    !ie_match_stat(istate, alias, st, ce_option)) {
@@ -934,7 +934,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
 	} else
 		set_object_name_for_intent_to_add_entry(ce);
 
-	if (repo_ignore_case(the_repository) && alias && different_name(ce, alias))
+	if (repo_ignore_case(istate->repo) && alias && different_name(ce, alias))
 		ce = create_alias_ce(istate, ce, alias);
 	ce->ce_flags |= CE_ADDED;
 
@@ -1537,7 +1537,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	int t2_sum_scan = 0;
 
 	if (flags & REFRESH_PROGRESS && isatty(2))
-		progress = start_delayed_progress(the_repository,
+		progress = start_delayed_progress(istate->repo,
 						  _("Refresh index"),
 						  istate->cache_nr);
 
@@ -3874,6 +3874,7 @@ static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base
 void overlay_tree_on_index(struct index_state *istate,
 			   const char *tree_name, const char *prefix)
 {
+	struct repository *repo = istate->repo;
 	struct tree *tree;
 	struct object_id oid;
 	struct pathspec pathspec;
@@ -3882,9 +3883,9 @@ void overlay_tree_on_index(struct index_state *istate,
 	read_tree_fn_t fn = NULL;
 	int err;
 
-	if (repo_get_oid(the_repository, tree_name, &oid))
+	if (repo_get_oid(repo, tree_name, &oid))
 		die("tree-ish %s not found.", tree_name);
-	tree = repo_parse_tree_indirect(the_repository, &oid);
+	tree = repo_parse_tree_indirect(repo, &oid);
 	if (!tree)
 		die("bad tree-ish %s", tree_name);
 
@@ -3919,7 +3920,7 @@ void overlay_tree_on_index(struct index_state *istate,
 
 	if (!fn)
 		fn = read_one_entry_quick;
-	err = read_tree(the_repository, tree, &pathspec, fn, istate);
+	err = read_tree(repo, tree, &pathspec, fn, istate);
 	clear_pathspec(&pathspec);
 	if (err)
 		die("unable to read tree entries %s", tree_name);

base-commit: 1891de46f79dc444a47db1c87bd0c8c76b5463f2
-- 
gitgitgadget

      parent reply	other threads:[~2026-11-18 18:45 UTC|newest]

Thread overview: 4+ 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
2026-11-18 18:45 ` Srujith A Poojary via GitGitGadget [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=pull.2315.v2.git.1795027523258.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=poojarysrujith@gmail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.