diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:05 -0800 |
| commit | bdc370a5c1439cbfa020a516d69108dc87a4be7c (patch) | |
| tree | 76c9b529a2628f7f448a03a816e73e65ad3fa992 /fast-import.c | |
| parent | 844f7e61c9c2fcacc05eaa826a4695f20050dce5 (diff) | |
| parent | 8de7eeb54b6aaa6d429b5d9c2b667847c35480ff (diff) | |
| download | git-bdc370a5c1439cbfa020a516d69108dc87a4be7c.tar.gz | |
Merge branch 'jc/compression-config' into maint
Compression setting for producing packfiles were spread across
three codepaths, one of which did not honor any configuration.
Unify these so that all of them honor core.compression and
pack.compression variables the same way.
* jc/compression-config:
compression: unify pack.compression configuration parsing
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/fast-import.c b/fast-import.c index cb545d7df5..f561ba833b 100644 --- a/fast-import.c +++ b/fast-import.c @@ -284,8 +284,6 @@ static unsigned long max_depth = 10; static off_t max_packsize; static int unpack_limit = 100; static int force_update; -static int pack_compression_level = Z_DEFAULT_COMPRESSION; -static int pack_compression_seen; /* Stats and misc. counters */ static uintmax_t alloc_count; @@ -3381,15 +3379,6 @@ static void git_pack_config(void) if (max_depth > MAX_DEPTH) max_depth = MAX_DEPTH; } - if (!git_config_get_int("pack.compression", &pack_compression_level)) { - if (pack_compression_level == -1) - pack_compression_level = Z_DEFAULT_COMPRESSION; - else if (pack_compression_level < 0 || - pack_compression_level > Z_BEST_COMPRESSION) - git_die_config("pack.compression", - "bad pack compression level %d", pack_compression_level); - pack_compression_seen = 1; - } if (!git_config_get_int("pack.indexversion", &indexversion_value)) { pack_idx_opts.version = indexversion_value; if (pack_idx_opts.version > 2) @@ -3454,8 +3443,6 @@ int cmd_main(int argc, const char **argv) setup_git_directory(); reset_pack_idx_option(&pack_idx_opts); git_pack_config(); - if (!pack_compression_seen && core_compression_seen) - pack_compression_level = core_compression_level; alloc_objects(object_entry_alloc); strbuf_init(&command_buf, 0); |