summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-29 23:49:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-29 23:49:42 (GMT)
commiteb293ac8d62b05ce15b837759a5e660617212a37 (patch)
treeb2bc33be22e824239c7d0a92283a7a28a75508f6
parente25e6f3947403ed87cc016b7dc2c0692a5b6c2d2 (diff)
parent07e7dbf0db05a550a92a6a5a8977ac47efa7b794 (diff)
downloadgit-eb293ac8d62b05ce15b837759a5e660617212a37.zip
git-eb293ac8d62b05ce15b837759a5e660617212a37.tar.gz
git-eb293ac8d62b05ce15b837759a5e660617212a37.tar.bz2
Merge branch 'jk/reduce-gc-aggressive-depth' into maint
"git gc --aggressive" used to limit the delta-chain length to 250, which is way too deep for gaining additional space savings and is detrimental for runtime performance. The limit has been reduced to 50. * jk/reduce-gc-aggressive-depth: gc: default aggressive depth to 50
-rw-r--r--Documentation/config.txt2
-rw-r--r--builtin/gc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0bcb679..8eb403d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1366,7 +1366,7 @@ fsck.skipList::
gc.aggressiveDepth::
The depth parameter used in the delta compression
algorithm used by 'git gc --aggressive'. This defaults
- to 250.
+ to 50.
gc.aggressiveWindow::
The window size parameter used in the delta compression
diff --git a/builtin/gc.c b/builtin/gc.c
index 332bcf7..069950d 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -28,7 +28,7 @@ static const char * const builtin_gc_usage[] = {
static int pack_refs = 1;
static int prune_reflogs = 1;
-static int aggressive_depth = 250;
+static int aggressive_depth = 50;
static int aggressive_window = 250;
static int gc_auto_threshold = 6700;
static int gc_auto_pack_limit = 50;