Merge branch 'sh/enable-preloadindex'

* sh/enable-preloadindex:
environment.c: enable core.preloadindex by default

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 20cb3a25bc6bc77e62fe05c6ce2d1e8e16e2bfea..9f467d3820a40d1281d29707e98fa16c2bbde63f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -621,9 +621,9 @@ core.preloadindex::
 +
 This can speed up operations like 'git diff' and 'git status' especially
 on filesystems like NFS that have weak caching semantics and thus
-relatively high IO latencies.  With this set to 'true', Git will do the
+relatively high IO latencies.  When enabled, Git will do the
 index comparison to the filesystem data in parallel, allowing
-overlapping IO's.
+overlapping IO's.  Defaults to true.
 
 core.createObject::
        You can set this to 'link', in which case a hardlink followed by

diff --git a/environment.c b/environment.c
index c648ac3d3af1f86889ccc34e7f794683bd1951ea..4dac5e9edd75499ccf52debc847807d2fc180730 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -72,7 +72,7 @@ char comment_line_char = '#';
 int auto_comment_line_char;
 
 /* Parallel index stat data preload? */
-int core_preload_index = 0;
+int core_preload_index = 1;
 
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 char *git_work_tree_cfg;