From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jun 2014 19:18:49 +0000 (-0700)
Subject: Merge branch 'sh/enable-preloadindex'
X-Git-Tag: v2.1.0-rc0~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96b29bde9194f96cb711a00876700ea8dd9c0727;p=thirdparty%2Fgit.git

Merge branch 'sh/enable-preloadindex'

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

96b29bde9194f96cb711a00876700ea8dd9c0727
diff --cc environment.c
index c648ac3d3a,1c686c9095..4dac5e9edd
--- a/environment.c
+++ b/environment.c
@@@ -69,10 -69,9 +69,10 @@@ unsigned long pack_size_limit_cfg
   * that is subject to stripspace.
   */
  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;