development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'al/trace2-clearing-skip-worktree'

Browse source 
Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.

* al/trace2-clearing-skip-worktree:
  index: raise a bug if the index is materialised more than once
  index: add trace2 region for clear skip worktree
This commit is contained in:
Taylor Blau 2022-11-14 19:53:33 -05:00
parent 561f3948a5 8c7abdc596
commit d0c3853034
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sparse-index.c
View file

@ -493,24 +493,42 @@ void clear_skip_worktree_from_present_files(struct index_state *istate)
int dir_found = 1;
int i;
int path_count[2] = {0, 0};
int restarted = 0;
if (!core_apply_sparse_checkout ||
sparse_expect_files_outside_of_patterns)
return;
trace2_region_enter("index", "clear_skip_worktree_from_present_files",
istate->repo);
restart:
for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = istate->cache[i];
if (ce_skip_worktree(ce) &&
path_found(ce->name, &last_dirname, &dir_len, &dir_found)) {
if (S_ISSPARSEDIR(ce->ce_mode)) {
ensure_full_index(istate);
goto restart;
if (ce_skip_worktree(ce)) {
path_count[restarted]++;
if (path_found(ce->name, &last_dirname, &dir_len, &dir_found)) {
if (S_ISSPARSEDIR(ce->ce_mode)) {
if (restarted)
BUG("ensure-full-index did not fully flatten?");
ensure_full_index(istate);
restarted = 1;
goto restart;
}
ce->ce_flags &= ~CE_SKIP_WORKTREE;
}
ce->ce_flags &= ~CE_SKIP_WORKTREE;
}
}
if (path_count[0])
trace2_data_intmax("index", istate->repo,
"sparse_path_count", path_count[0]);
if (restarted)
trace2_data_intmax("index", istate->repo,
"sparse_path_count_full", path_count[1]);
trace2_region_leave("index", "clear_skip_worktree_from_present_files",
istate->repo);
}
/*