Merge pull request #1419 from atetubou/enable_fscache

Git for Windows Build Agent · Git for Windows Build Agent · commit 81f47e284951 · 2018-01-22T09:33:07.000Z
checkout.c: enable fscache for checkout_entry
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -359,6 +359,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 	state.istate = &the_index;
 
 	enable_delayed_checkout(&state);
+	enable_fscache(1);
 	for (pos = 0; pos < active_nr; pos++) {
 		struct cache_entry *ce = active_cache[pos];
 		if (ce->ce_flags & CE_MATCHED) {
@@ -373,6 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 			pos = skip_same_name(ce, pos) - 1;
 		}
 	}
+	enable_fscache(0);
 	errs |= finish_delayed_checkout(&state);
 
 	if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,7 @@ static int checkout_paths(const struct checkout_opts *opts,`
`359`	`359`	`state.istate = &the_index;`
`360`	`360`
`361`	`361`	`enable_delayed_checkout(&state);`
	`362`	`+ enable_fscache(1);`
`362`	`363`	`for (pos = 0; pos < active_nr; pos++) {`
`363`	`364`	`struct cache_entry *ce = active_cache[pos];`
`364`	`365`	`if (ce->ce_flags & CE_MATCHED) {`
`@@ -373,6 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts,`
`373`	`374`	`pos = skip_same_name(ce, pos) - 1;`
`374`	`375`	`}`
`375`	`376`	`}`
	`377`	`+ enable_fscache(0);`
`376`	`378`	`errs \|= finish_delayed_checkout(&state);`
`377`	`379`
`378`	`380`	`if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))`