git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-16 13:04:57 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'jd/unpack-trees-wo-the-repository' into jch

Browse Source 
A handful of inappropriate uses of the_repository have been
rewritten to use the right repository structure instance in the
unpack-trees.c codepath.

* jd/unpack-trees-wo-the-repository:
  unpack-trees: use repository from index instead of global
This commit is contained in:
Junio C Hamano
2026-06-15 10:27:16 -07:00
parent 48e75964ad 0c20c6cb23
commit 03dac063b4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
unpack-trees.c
View File

@@ -1780,14 +1780,14 @@ static int clear_ce_flags(struct index_state *istate,
xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)",
(unsigned long)select_mask, (unsigned long)clear_mask);
trace2_region_enter("unpack_trees", label, the_repository);
trace2_region_enter("unpack_trees", label, istate->repo);
rval = clear_ce_flags_1(istate,
istate->cache,
istate->cache_nr,
&prefix,
select_mask, clear_mask,
pl, 0, 0);
trace2_region_leave("unpack_trees", label, the_repository);
trace2_region_leave("unpack_trees", label, istate->repo);
stop_progress(&istate->progress);
return rval;
@@ -1882,7 +1882,7 @@ static int verify_absent(const struct cache_entry *,
*/
int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
{
struct repository *repo = the_repository;
struct repository *repo = o->src_index->repo;
int i, ret;
static struct cache_entry *dfc;
struct pattern_list pl;
@@ -1903,7 +1903,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
BUG("o->df_conflict_entry is an output only field");
trace_performance_enter();
trace2_region_enter("unpack_trees", "unpack_trees", the_repository);
trace2_region_enter("unpack_trees", "unpack_trees", repo);
prepare_repo_settings(repo);
if (repo->settings.command_requires_full_index) {
@@ -2007,9 +2007,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
}
trace_performance_enter();
trace2_region_enter("unpack_trees", "traverse_trees", the_repository);
trace2_region_enter("unpack_trees", "traverse_trees", repo);
ret = traverse_trees(o->src_index, len, t, &info);
trace2_region_leave("unpack_trees", "traverse_trees", the_repository);
trace2_region_leave("unpack_trees", "traverse_trees", repo);
trace_performance_leave("traverse_trees");
if (ret < 0)
goto return_failed;
@@ -2106,7 +2106,7 @@ done:
dir_clear(o->internal.dir);
o->internal.dir = NULL;
}
trace2_region_leave("unpack_trees", "unpack_trees", the_repository);
trace2_region_leave("unpack_trees", "unpack_trees", repo);
trace_performance_leave("unpack_trees");
return ret;