Merge branch 'cf/submodule-progress-dissociate'

diff --git a/environment.c b/environment.c
index f4dd45eb3d7482a8b4d5d05973e5b1605433de29..2a6de2330bc024d19ab0c1d8cc594f146ca6da11 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -55,6 +55,7 @@ int check_replace_refs = 1; /* NEEDSWORK: rename to read_replace_refs */
 char *git_replace_ref_base;
 enum eol core_eol = EOL_UNSET;
 int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN;
+char *check_roundtrip_encoding = "SHIFT-JIS";
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
 enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
 enum rebase_setup_type autorebase = AUTOREBASE_NEVER;