diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 06:59:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 06:59:22 (GMT) |
| commit | 1ac0ce4d32ab7a3546e7e84a562625576208c7db (patch) | |
| tree | 23ebffb680b2fe7b69453bb55d8170f69d767a69 /environment.c | |
| parent | 7d7d051c5e2b9f70adfe5538bd9ccbf60f35d4be (diff) | |
| parent | e92d6225361eba5ff34696122d1491dc7ace2a5a (diff) | |
| download | git-1ac0ce4d32ab7a3546e7e84a562625576208c7db.zip git-1ac0ce4d32ab7a3546e7e84a562625576208c7db.tar.gz git-1ac0ce4d32ab7a3546e7e84a562625576208c7db.tar.bz2 | |
Merge branch 'ls/checkout-encoding'
The new "checkout-encoding" attribute can ask Git to convert the
contents to the specified encoding when checking out to the working
tree (and the other way around when checking in).
* ls/checkout-encoding:
convert: add round trip check based on 'core.checkRoundtripEncoding'
convert: add tracing for 'working-tree-encoding' attribute
convert: check for detectable errors in UTF encodings
convert: add 'working-tree-encoding' attribute
utf8: add function to detect a missing UTF-16/32 BOM
utf8: add function to detect prohibited UTF-16/32 BOM
utf8: teach same_encoding() alternative UTF encoding names
strbuf: add a case insensitive starts_with()
strbuf: add xstrdup_toupper()
strbuf: remove unnecessary NUL assignment in xstrdup_tolower()
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index f4dd45e..2a6de23 100644 --- 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; |