From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 May 2018 06:59:22 +0000 (+0900)
Subject: Merge branch 'ls/checkout-encoding'
X-Git-Tag: v2.18.0-rc0~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ac0ce4d32ab7a3546e7e84a562625576208c7db;p=thirdparty%2Fgit.git

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()
---

1ac0ce4d32ab7a3546e7e84a562625576208c7db