Merge branch 'rs/drop-core-compression-vars' into maint
Code clean-up. * rs/drop-core-compression-vars: compression: drop write-only core_compression_* variables
This commit is contained in:
commit
b306aefded
1
cache.h
1
cache.h
@ -958,7 +958,6 @@ extern char *apply_default_ignorewhitespace;
|
|||||||
extern const char *git_attributes_file;
|
extern const char *git_attributes_file;
|
||||||
extern const char *git_hooks_path;
|
extern const char *git_hooks_path;
|
||||||
extern int zlib_compression_level;
|
extern int zlib_compression_level;
|
||||||
extern int core_compression_level;
|
|
||||||
extern int pack_compression_level;
|
extern int pack_compression_level;
|
||||||
extern size_t packed_git_window_size;
|
extern size_t packed_git_window_size;
|
||||||
extern size_t packed_git_limit;
|
extern size_t packed_git_limit;
|
||||||
|
3
config.c
3
config.c
@ -76,7 +76,6 @@ static struct key_value_info *current_config_kvi;
|
|||||||
*/
|
*/
|
||||||
static enum config_scope current_parsing_scope;
|
static enum config_scope current_parsing_scope;
|
||||||
|
|
||||||
static int core_compression_seen;
|
|
||||||
static int pack_compression_seen;
|
static int pack_compression_seen;
|
||||||
static int zlib_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;
|
level = Z_DEFAULT_COMPRESSION;
|
||||||
else if (level < 0 || level > Z_BEST_COMPRESSION)
|
else if (level < 0 || level > Z_BEST_COMPRESSION)
|
||||||
die(_("bad zlib compression level %d"), level);
|
die(_("bad zlib compression level %d"), level);
|
||||||
core_compression_level = level;
|
|
||||||
core_compression_seen = 1;
|
|
||||||
if (!zlib_compression_seen)
|
if (!zlib_compression_seen)
|
||||||
zlib_compression_level = level;
|
zlib_compression_level = level;
|
||||||
if (!pack_compression_seen)
|
if (!pack_compression_seen)
|
||||||
|
@ -41,7 +41,6 @@ char *apply_default_ignorewhitespace;
|
|||||||
const char *git_attributes_file;
|
const char *git_attributes_file;
|
||||||
const char *git_hooks_path;
|
const char *git_hooks_path;
|
||||||
int zlib_compression_level = Z_BEST_SPEED;
|
int zlib_compression_level = Z_BEST_SPEED;
|
||||||
int core_compression_level;
|
|
||||||
int pack_compression_level = Z_DEFAULT_COMPRESSION;
|
int pack_compression_level = Z_DEFAULT_COMPRESSION;
|
||||||
int fsync_object_files;
|
int fsync_object_files;
|
||||||
size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
|
size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user