Subject: [PATCH] cache-tree: use index state repository in trace2 calls

From: "Jayesh Daga via GitGitGadget" <[email-masked]>
Date: Tue, 31 Mar 2026 10:02:53 +0000

From: Jayesh Daga <[email-masked]>

trace2 calls in cache-tree.c use the global 'the_repository',
even though cache_tree_update() has access to an explicit
repository pointer via 'istate->repo'.

Using the global repository can result in incorrect trace2
output when multiple repository instances are in use, as
events may be attributed to the wrong repository.

Use 'istate->repo' in cache_tree_update() to ensure correct
repository attribution.

Other call sites are left unchanged as they do not have
access to a repository instance.

Signed-off-by: Jayesh Daga <[email-masked]>
---
    cache-tree: use index state repository in trace2 calls
    
    trace2 calls in cache-tree.c use the global 'the_repository', even
    though cache_tree_update() has access to an explicit repository pointer
    via 'istate->repo'.
    
    Using the global repository can result in incorrect trace2 output when
    multiple repository instances are in use, as events may be attributed to
    the wrong repository.
    
    Use 'istate->repo' instead in these call sites to ensure correct
    repository attribution.
    
    Signed-off-by: Jayesh Daga [email-masked]
    
    cc :Karthik Nayak [email-masked]

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2259%2Fjayesh0104%2Fcache-tree-trace2-repo-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2259/jayesh0104/cache-tree-trace2-repo-v1
Pull-Request: https://github.com/git/git/pull/2259

 cache-tree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cache-tree.c b/cache-tree.c
index 60bcc07c3b..e4f9174c4a 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -488,12 +488,12 @@ int cache_tree_update(struct index_state *istate, int flags)
 		prefetch_cache_entries(istate, must_check_existence);
 
 	trace_performance_enter();
-	trace2_region_enter("cache_tree", "update", the_repository);
+	trace2_region_enter("cache_tree", "update", istate->repo);
 	transaction = odb_transaction_begin(the_repository->objects);
 	i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,
 		       "", 0, &skip, flags);
 	odb_transaction_commit(transaction);
-	trace2_region_leave("cache_tree", "update", the_repository);
+	trace2_region_leave("cache_tree", "update", istate->repo);
 	trace_performance_leave("cache_tree_update");
 	if (i < 0)
 		return i;

base-commit: 5361983c075154725be47b65cca9a2421789e410
-- 
gitgitgadget