path: root/convert.h
diff options
authorJunio C Hamano <>2018-05-08 06:59:22 (GMT)
committerJunio C Hamano <>2018-05-08 06:59:22 (GMT)
commit1ac0ce4d32ab7a3546e7e84a562625576208c7db (patch)
tree23ebffb680b2fe7b69453bb55d8170f69d767a69 /convert.h
parent7d7d051c5e2b9f70adfe5538bd9ccbf60f35d4be (diff)
parente92d6225361eba5ff34696122d1491dc7ace2a5a (diff)
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 'convert.h')
1 files changed, 2 insertions, 0 deletions
diff --git a/convert.h b/convert.h
index 2e9b4f4..01385d9 100644
--- a/convert.h
+++ b/convert.h
@@ -12,6 +12,7 @@ struct index_state;
#define CONV_EOL_RNDTRP_WARN (1<<1) /* Warn if CRLF to LF to CRLF is different */
#define CONV_EOL_RENORMALIZE (1<<2) /* Convert CRLF to LF */
#define CONV_EOL_KEEP_CRLF (1<<3) /* Keep CRLF line endings as is */
+#define CONV_WRITE_OBJECT (1<<4) /* Content is written to the index */
extern int global_conv_flags_eol;
@@ -55,6 +56,7 @@ struct delayed_checkout {
extern enum eol core_eol;
+extern char *check_roundtrip_encoding;
extern const char *get_cached_convert_stats_ascii(const struct index_state *istate,
const char *path);
extern const char *get_wt_convert_stats_ascii(const char *path);