hash-object: cleanup handling of command line options

diff --git a/environment.c b/environment.c
index 1dab72ec1525ca6dd15ca20666cd91506b85890c..3527f1663f3f948085ab56a81609ed9764b4e6e9 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -30,12 +30,13 @@ int core_compression_seen;
 size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
 size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
 size_t delta_base_cache_limit = 16 * 1024 * 1024;
-char *pager_program;
-int pager_in_use;
+const char *pager_program;
 int pager_use_color = 1;
-char *editor_program;
-char *excludes_file;
+const char *editor_program;
+const char *excludes_file;
 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
+enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
+unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
 
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 char *git_work_tree_cfg;