Merge pull request #1827 from benpeart/fscache_refresh_index

dscho · dscho · commit 7fee55eeee06 · 2018-10-12T23:03:57.000+02:00
Enable the filesystem cache (fscache) in refresh_index().
diff --git a/read-cache.c b/read-cache.c
@@ -1483,6 +1483,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
 	added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
 	unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
+	enable_fscache(1);
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct cache_entry *ce, *new_entry;
 		int cache_errno = 0;
@@ -1547,6 +1548,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 
 		replace_index_entry(istate, i, new_entry);
 	}
+	enable_fscache(0);
 	trace_performance_since(start, "refresh index");
 	return has_errors;
 }

Original file line number	Diff line number	Diff line change
`@@ -1483,6 +1483,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,`
`1483`	`1483`	`typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");`
`1484`	`1484`	`added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");`
`1485`	`1485`	`unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");`
	`1486`	`+ enable_fscache(1);`
`1486`	`1487`	`for (i = 0; i < istate->cache_nr; i++) {`
`1487`	`1488`	`struct cache_entry ce, new_entry;`
`1488`	`1489`	`int cache_errno = 0;`
`@@ -1547,6 +1548,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,`
`1547`	`1548`
`1548`	`1549`	`replace_index_entry(istate, i, new_entry);`
`1549`	`1550`	`}`
	`1551`	`+ enable_fscache(0);`
`1550`	`1552`	`trace_performance_since(start, "refresh index");`
`1551`	`1553`	`return has_errors;`
`1552`	`1554`	`}`