Skip to content

Commit 0df739e

Browse files
jayesh0104gitster
authored andcommitted
unpack-trees: use repository from index instead of global
unpack_trees() currently initializes its repository from the global 'the_repository', even though a repository instance is already available via the source index. Use 'o->src_index->repo' instead of the global variable, reducing reliance on global repository state. This is a step towards eliminating global repository usage in unpack_trees(). Suggested-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Jayesh Daga <jayeshdaga99@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 5361983 commit 0df739e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

unpack-trees.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,14 +1780,14 @@ static int clear_ce_flags(struct index_state *istate,
17801780

17811781
xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)",
17821782
(unsigned long)select_mask, (unsigned long)clear_mask);
1783-
trace2_region_enter("unpack_trees", label, the_repository);
1783+
trace2_region_enter("unpack_trees", label, istate->repo);
17841784
rval = clear_ce_flags_1(istate,
17851785
istate->cache,
17861786
istate->cache_nr,
17871787
&prefix,
17881788
select_mask, clear_mask,
17891789
pl, 0, 0);
1790-
trace2_region_leave("unpack_trees", label, the_repository);
1790+
trace2_region_leave("unpack_trees", label, istate->repo);
17911791

17921792
stop_progress(&istate->progress);
17931793
return rval;
@@ -1903,7 +1903,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
19031903
BUG("o->df_conflict_entry is an output only field");
19041904

19051905
trace_performance_enter();
1906-
trace2_region_enter("unpack_trees", "unpack_trees", the_repository);
1906+
trace2_region_enter("unpack_trees", "unpack_trees", repo);
19071907

19081908
prepare_repo_settings(repo);
19091909
if (repo->settings.command_requires_full_index) {
@@ -2007,9 +2007,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
20072007
}
20082008

20092009
trace_performance_enter();
2010-
trace2_region_enter("unpack_trees", "traverse_trees", the_repository);
2010+
trace2_region_enter("unpack_trees", "traverse_trees", repo);
20112011
ret = traverse_trees(o->src_index, len, t, &info);
2012-
trace2_region_leave("unpack_trees", "traverse_trees", the_repository);
2012+
trace2_region_leave("unpack_trees", "traverse_trees", repo);
20132013
trace_performance_leave("traverse_trees");
20142014
if (ret < 0)
20152015
goto return_failed;
@@ -2106,7 +2106,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
21062106
dir_clear(o->internal.dir);
21072107
o->internal.dir = NULL;
21082108
}
2109-
trace2_region_leave("unpack_trees", "unpack_trees", the_repository);
2109+
trace2_region_leave("unpack_trees", "unpack_trees", repo);
21102110
trace_performance_leave("unpack_trees");
21112111
return ret;
21122112

0 commit comments

Comments
 (0)