Merge branch 'jc/no-lazy-fetch'

[thirdparty/git.git] / environment.c

diff --git a/environment.c b/environment.c
index 0ae5bbd4a185410a5dc3605cde193a0e9ad73006..60706ea3987f2c4d11e5e2e2d21aa5cd5e9196e1 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -64,7 +64,7 @@ const char *excludes_file;
 enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
 enum eol core_eol = EOL_UNSET;
 int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN;
-char *check_roundtrip_encoding = "SHIFT-JIS";
+const char *check_roundtrip_encoding = "SHIFT-JIS";
 enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
 enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
 enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;