path: root/environment.c
diff options
authorLars Schneider <>2018-04-15 18:16:10 (GMT)
committerJunio C Hamano <>2018-04-16 02:40:56 (GMT)
commite92d6225361eba5ff34696122d1491dc7ace2a5a (patch)
treedcb3ac5d5b153ce1052c139c52cacfc4a0706b0e /environment.c
parent541d059cd903bb8e510f876ea2bc33719b76b33c (diff)
convert: add round trip check based on 'core.checkRoundtripEncoding'
UTF supports lossless conversion round tripping and conversions between UTF and other encodings are mostly round trip safe as Unicode aims to be a superset of all other character encodings. However, certain encodings (e.g. SHIFT-JIS) are known to have round trip issues [1]. Add 'core.checkRoundtripEncoding', which contains a comma separated list of encodings, to define for what encodings Git should check the conversion round trip if they are used in the 'working-tree-encoding' attribute. Set SHIFT-JIS as default value for 'core.checkRoundtripEncoding'. [1] Signed-off-by: Lars Schneider <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'environment.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 10a32c2..5bae913 100644
--- a/environment.c
+++ b/environment.c
@@ -50,6 +50,7 @@ int check_replace_refs = 1;
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;