summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-31 13:32:05 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-31 13:32:05 -0800
commitbdc370a5c1439cbfa020a516d69108dc87a4be7c (patch)
tree76c9b529a2628f7f448a03a816e73e65ad3fa992 /environment.c
parent844f7e61c9c2fcacc05eaa826a4695f20050dce5 (diff)
parent8de7eeb54b6aaa6d429b5d9c2b667847c35480ff (diff)
downloadgit-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 'environment.c')
-rw-r--r--environment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c
index 0935ec696e..4bce3eebfa 100644
--- a/environment.c
+++ b/environment.c
@@ -34,7 +34,7 @@ const char *git_attributes_file;
const char *git_hooks_path;
int zlib_compression_level = Z_BEST_SPEED;
int core_compression_level;
-int core_compression_seen;
+int pack_compression_level = Z_DEFAULT_COMPRESSION;
int fsync_object_files;
size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;