summaryrefslogtreecommitdiff
path: root/convert.h
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2018-04-15 18:16:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-16 02:40:56 (GMT)
commit107642fe2661236f48b912480e090799e339c512 (patch)
treeb2a3da7a30edca2ef3241f87656fdeef39f6de56 /convert.h
parentc6e48652f69f6955bbbb423100e0df2a49467db8 (diff)
downloadgit-107642fe2661236f48b912480e090799e339c512.zip
git-107642fe2661236f48b912480e090799e339c512.tar.gz
git-107642fe2661236f48b912480e090799e339c512.tar.bz2
convert: add 'working-tree-encoding' attribute
Git recognizes files encoded with ASCII or one of its supersets (e.g. UTF-8 or ISO-8859-1) as text files. All other encodings are usually interpreted as binary and consequently built-in Git text processing tools (e.g. 'git diff') as well as most Git web front ends do not visualize the content. Add an attribute to tell Git what encoding the user has defined for a given file. If the content is added to the index, then Git reencodes the content to a canonical UTF-8 representation. On checkout Git will reverse this operation. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.h')
-rw-r--r--convert.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/convert.h b/convert.h
index 65ab3e5..1d9539e 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;