summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 18:18:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-06 18:18:34 (GMT)
commitd2a274aa87d69786aa95da2f2eab88aa6b77644f (patch)
treef4569bebed6e4dbd98fa838ab24bd85e9bc81901
parent7461a3e9fca9b73e35386a1d8a2de2cf8b444871 (diff)
parent4874f544f1574a55d787339a6455f524768c1b5d (diff)
downloadgit-d2a274aa87d69786aa95da2f2eab88aa6b77644f.zip
git-d2a274aa87d69786aa95da2f2eab88aa6b77644f.tar.gz
git-d2a274aa87d69786aa95da2f2eab88aa6b77644f.tar.bz2
Merge branch 'dk/raise-core-deltabasecachelimit'
The `core.deltabasecachelimit` used to default to 16 MiB , but this proved to be too small, and has been bumped to 96 MiB. * dk/raise-core-deltabasecachelimit: Bump core.deltaBaseCacheLimit to 96m
-rw-r--r--Documentation/config.txt2
-rw-r--r--environment.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9c4ceb3..a33c087 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -489,7 +489,7 @@ core.deltaBaseCacheLimit::
to avoid unpacking and decompressing frequently used base
objects multiple times.
+
-Default is 16 MiB on all platforms. This should be reasonable
+Default is 96 MiB on all platforms. This should be reasonable
for all users/operating systems, except on the largest projects.
You probably do not need to adjust this value.
+
diff --git a/environment.c b/environment.c
index 5c4815d..37354c8 100644
--- a/environment.c
+++ b/environment.c
@@ -37,7 +37,7 @@ int core_compression_seen;
int fsync_object_files;
size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
-size_t delta_base_cache_limit = 16 * 1024 * 1024;
+size_t delta_base_cache_limit = 96 * 1024 * 1024;
unsigned long big_file_threshold = 512 * 1024 * 1024;
const char *pager_program;
int pager_use_color = 1;