Merge branch 'js/fmt-merge-msg'

diff --git a/environment.c b/environment.c
index 3de8eb3b2a2359a9f8a9f702076292f1e1429df3..43823ff7d650a95dbb06e74397bdc5b7e5c00528 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -20,6 +20,7 @@ int repository_format_version = 0;
 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
 int shared_repository = PERM_UMASK;
 const char *apply_default_whitespace = NULL;
+int zlib_compression_level = Z_DEFAULT_COMPRESSION;
 
 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
        *git_graft_file;