Increase pack.depth default to 50

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 840dd81b8192a8f03572196e4b057f1bc8ad9317..ea434af9db1e864c4230b60886f1ca24237327e4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -548,7 +548,7 @@ pack.window::
 
 pack.depth::
        The maximum delta depth used by gitlink:git-pack-objects[1] when no
 
 pack.depth::
        The maximum delta depth used by gitlink:git-pack-objects[1] when no

-       maximum depth is given on the command line. Defaults to 10.
+       maximum depth is given on the command line. Defaults to 50.

 
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
 
 pull.octopus::
        The default merge strategy to use when pulling multiple branches

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 5a7204c9fba1c104444103e471da4f86f1a8152f..bd3ee456e336add5d880d6a1192646220e7c34d7 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -83,7 +83,7 @@ base-name::
        it too deep affects the performance on the unpacker
        side, because delta data needs to be applied that many
        times to get to the necessary object.
        it too deep affects the performance on the unpacker
        side, because delta data needs to be applied that many
        times to get to the necessary object.

-       The default value for --window is 10 and --depth is 10.
+       The default value for --window is 10 and --depth is 50.

 
 --incremental::
        This flag causes an object already in a pack ignored
 
 --incremental::
        This flag causes an object already in a pack ignored

diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 0d70c9f78240a5ca194168a1c83a926dcb97443f..cc3b0b21c727349eb3a51d9837bc006b987537c3 100644 (file)
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -63,7 +63,7 @@ OPTIONS
        space. `--depth` limits the maximum delta depth; making it too deep
        affects the performance on the unpacker side, because delta data needs
        to be applied that many times to get to the necessary object.
        space. `--depth` limits the maximum delta depth; making it too deep
        affects the performance on the unpacker side, because delta data needs
        to be applied that many times to get to the necessary object.

-       The default value for --window is 10 and --depth is 10.
+       The default value for --window is 10 and --depth is 50.

 
 
 Configuration
 
 
 Configuration

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 79d92289250af25c0518a2fb1877041e0ce59f86..966f843e4357d45b8c9acf96617bdacd8dc1b133 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -64,7 +64,7 @@ static char tmpname[PATH_MAX];
 static unsigned char pack_file_sha1[20];
 static int progress = 1;
 static int window = 10;
 static unsigned char pack_file_sha1[20];
 static int progress = 1;
 static int window = 10;

-static int depth = 10;
+static int depth = 50;

 static int pack_to_stdout;
 static int num_preferred_base;
 static struct progress progress_state;
 static int pack_to_stdout;
 static int num_preferred_base;
 static struct progress progress_state;