summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 20:44:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-23 20:44:46 (GMT)
commite3b77a2d03258bc640076a2319cd3c289e87a389 (patch)
treeb0b4b8c38f0876435383cfaa397e4622b56e1e3c
parent28caad63d0f58611a22bf5b11e4914496ecb25b1 (diff)
parent8f0f11015683c0db1a06148300624fdb767b1d27 (diff)
downloadgit-e3b77a2d03258bc640076a2319cd3c289e87a389.zip
git-e3b77a2d03258bc640076a2319cd3c289e87a389.tar.gz
git-e3b77a2d03258bc640076a2319cd3c289e87a389.tar.bz2
Merge branch 'rs/drop-core-compression-vars'
Code clean-up. * rs/drop-core-compression-vars: compression: drop write-only core_compression_* variables
-rw-r--r--cache.h1
-rw-r--r--config.c3
-rw-r--r--environment.c1
3 files changed, 0 insertions, 5 deletions
diff --git a/cache.h b/cache.h
index 0c245d4..f6295f3 100644
--- a/cache.h
+++ b/cache.h
@@ -958,7 +958,6 @@ extern char *apply_default_ignorewhitespace;
extern const char *git_attributes_file;
extern const char *git_hooks_path;
extern int zlib_compression_level;
-extern int core_compression_level;
extern int pack_compression_level;
extern size_t packed_git_window_size;
extern size_t packed_git_limit;
diff --git a/config.c b/config.c
index 696d77c..2edf835 100644
--- a/config.c
+++ b/config.c
@@ -76,7 +76,6 @@ static struct key_value_info *current_config_kvi;
*/
static enum config_scope current_parsing_scope;
-static int core_compression_seen;
static int pack_compression_seen;
static int zlib_compression_seen;
@@ -1400,8 +1399,6 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
level = Z_DEFAULT_COMPRESSION;
else if (level < 0 || level > Z_BEST_COMPRESSION)
die(_("bad zlib compression level %d"), level);
- core_compression_level = level;
- core_compression_seen = 1;
if (!zlib_compression_seen)
zlib_compression_level = level;
if (!pack_compression_seen)
diff --git a/environment.c b/environment.c
index d6b22ed..b4ba4fa 100644
--- a/environment.c
+++ b/environment.c
@@ -41,7 +41,6 @@ char *apply_default_ignorewhitespace;
const char *git_attributes_file;
const char *git_hooks_path;
int zlib_compression_level = Z_BEST_SPEED;
-int core_compression_level;
int pack_compression_level = Z_DEFAULT_COMPRESSION;
int fsync_object_files;
size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;