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>
This commit is contained in:

committed by
Junio C Hamano

parent
abda522777
commit
842aaf9323
@ -546,6 +546,10 @@ pack.window::
|
|||||||
The size of the window used by gitlink:git-pack-objects[1] when no
|
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.
|
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::
|
pull.octopus::
|
||||||
The default merge strategy to use when pulling multiple branches
|
The default merge strategy to use when pulling multiple branches
|
||||||
at once.
|
at once.
|
||||||
|
@ -83,7 +83,7 @@ base-name::
|
|||||||
it too deep affects the performance on the unpacker
|
it too deep affects the performance on the unpacker
|
||||||
side, because delta data needs to be applied that many
|
side, because delta data needs to be applied that many
|
||||||
times to get to the necessary object.
|
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::
|
--incremental::
|
||||||
This flag causes an object already in a pack ignored
|
This flag causes an object already in a pack ignored
|
||||||
|
@ -63,7 +63,7 @@ OPTIONS
|
|||||||
space. `--depth` limits the maximum delta depth; making it too deep
|
space. `--depth` limits the maximum delta depth; making it too deep
|
||||||
affects the performance on the unpacker side, because delta data needs
|
affects the performance on the unpacker side, because delta data needs
|
||||||
to be applied that many times to get to the necessary object.
|
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
|
||||||
|
@ -64,6 +64,7 @@ static char tmpname[PATH_MAX];
|
|||||||
static unsigned char pack_file_sha1[20];
|
static unsigned char pack_file_sha1[20];
|
||||||
static int progress = 1;
|
static int progress = 1;
|
||||||
static int window = 10;
|
static int window = 10;
|
||||||
|
static int depth = 10;
|
||||||
static int pack_to_stdout;
|
static int pack_to_stdout;
|
||||||
static int num_preferred_base;
|
static int num_preferred_base;
|
||||||
static struct progress progress_state;
|
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);
|
window = git_config_int(k, v);
|
||||||
return 0;
|
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 use_internal_rev_list = 0;
|
||||||
int thin = 0;
|
int thin = 0;
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
|
Reference in New Issue
Block a user