Add pack.depth option to git-pack-objects.

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 24f9655fef8b9acbeb239554d55585480a0eede7..840dd81b8192a8f03572196e4b057f1bc8ad9317 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -546,6 +546,10 @@ pack.window::
        The size of the window used by gitlink:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.
 
        The size of the window used by gitlink:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.
 

+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.
+

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

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index d9e11c65344a52fd81023e26cc1535ac825106dd..5a7204c9fba1c104444103e471da4f86f1a8152f 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 both --window and --depth is 10.
+       The default value for --window is 10 and --depth is 10.

 
 --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 d39abc126dec70108625af13d11541b771c8e85d..0d70c9f78240a5ca194168a1c83a926dcb97443f 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 both --window and --depth is 10.
+       The default value for --window is 10 and --depth is 10.

 
 
 Configuration
 
 
 Configuration

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 7bff8eadd8d9d4edb146de97be70e9f08e7684a0..79d92289250af25c0518a2fb1877041e0ce59f86 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -64,6 +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 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;


@@ -1489,6 +1490,10 @@ static int git_pack_config(const char *k, const char *v)
                window = git_config_int(k, v);
                return 0;
        }
                window = git_config_int(k, v);
                return 0;
        }

+       if(!strcmp(k, "pack.depth")) {
+               depth = git_config_int(k, v);
+               return 0;
+       }

        return git_default_config(k, v);
 }
 
        return git_default_config(k, v);
 }
 


@@ -1584,7 +1589,6 @@ static int adjust_perm(const char *path, mode_t mode)
 
 int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 {
 
 int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 {

-       int depth = 10;

        int use_internal_rev_list = 0;
        int thin = 0;
        uint32_t i;
        int use_internal_rev_list = 0;
        int thin = 0;
        uint32_t i;