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 /sha1-file.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 'sha1-file.c')
| -rw-r--r-- | sha1-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1-file.c b/sha1-file.c index 64a5bd7..4607260 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -142,7 +142,7 @@ static int get_conv_flags(unsigned flags) if (flags & HASH_RENORMALIZE) return CONV_EOL_RENORMALIZE; else if (flags & HASH_WRITE_OBJECT) - return global_conv_flags_eol; + return global_conv_flags_eol | CONV_WRITE_OBJECT; else return 0; } |