Skip to content

Commit 0c6fe58

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 a54990e + e917e4c commit 0c6fe58

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

unpack-trees.c

+2
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,9 @@ static void mark_new_skip_worktree(struct pattern_list *pl,
15431543
* 2. Widen worktree according to sparse-checkout file.
15441544
* Matched entries will have skip_wt_flag cleared (i.e. "in")
15451545
*/
1546+
enable_fscache(istate->cache_nr);
15461547
clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress);
1548+
disable_fscache();
15471549
}
15481550

15491551
static void populate_from_existing_patterns(struct unpack_trees_options *o,

0 commit comments

Comments
 (0)