Skip to content

Commit 0f35fe6

Browse files
derrickstoleedscho
authored andcommitted
Merge branch 'fscache-and-sparse-checkout'
When updating the skip-worktree bits in the index to align with new values in a sparse-checkout file, Git scans the entire working directory with lstat() calls. In a sparse-checkout, many of these lstat() calls are for paths that do not exist. Enable the fscache feature during this scan. In a local test of a repo with ~2.2 million paths, updating the index with `git read-tree -m -u HEAD` with a sparse-checkout file containing only `/.gitattributes` improved from 2-3 minutes to 15-20 seconds. More work could be done to stop running lstat() calls when recursing into directories that are known to not exist.
2 parents 62f9bcc + 03354ea commit 0f35fe6

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

unpack-trees.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,7 +1447,9 @@ static void mark_new_skip_worktree(struct pattern_list *pl,
14471447
* 2. Widen worktree according to sparse-checkout file.
14481448
* Matched entries will have skip_wt_flag cleared (i.e. "in")
14491449
*/
1450+
enable_fscache(istate->cache_nr);
14501451
clear_ce_flags(istate, select_flag, skip_wt_flag, pl);
1452+
disable_fscache();
14511453
}
14521454

14531455
static int verify_absent(const struct cache_entry *,

0 commit comments

Comments
 (0)