summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-16 12:18:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-16 12:18:49 -0700
commit96b29bde9194f96cb711a00876700ea8dd9c0727 (patch)
treeaeac876d624d85aecad5a6bd7ed368ae08925948
parentMerge branch 'rs/read-ref-at' (diff)
parentenvironment.c: enable core.preloadindex by default (diff)
downloadtgif-96b29bde9194f96cb711a00876700ea8dd9c0727.tar.xz
Merge branch 'sh/enable-preloadindex'
* sh/enable-preloadindex: environment.c: enable core.preloadindex by default
-rw-r--r--Documentation/config.txt4
-rw-r--r--environment.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 20cb3a25bc..9f467d3820 100644
--- 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 c648ac3d3a..4dac5e9edd 100644
--- 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;