Browse Source

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>
maint
Theodore Ts'o 18 years ago committed by Junio C Hamano
parent
commit
842aaf9323
  1. 4
      Documentation/config.txt
  2. 2
      Documentation/git-pack-objects.txt
  3. 2
      Documentation/git-repack.txt
  4. 6
      builtin-pack-objects.c

4
Documentation/config.txt

@ -546,6 +546,10 @@ pack.window:: @@ -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.

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.

2
Documentation/git-pack-objects.txt

@ -83,7 +83,7 @@ base-name:: @@ -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.
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

2
Documentation/git-repack.txt

@ -63,7 +63,7 @@ OPTIONS @@ -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.
The default value for both --window and --depth is 10.
The default value for --window is 10 and --depth is 10.


Configuration

6
builtin-pack-objects.c

@ -64,6 +64,7 @@ static char tmpname[PATH_MAX]; @@ -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 int depth = 10;
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) @@ -1489,6 +1490,10 @@ static int git_pack_config(const char *k, const char *v)
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);
}

@ -1584,7 +1589,6 @@ static int adjust_perm(const char *path, mode_t mode) @@ -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 depth = 10;
int use_internal_rev_list = 0;
int thin = 0;
uint32_t i;

Loading…
Cancel
Save