From: Torsten Bögershausen <tboegi@xxxxxx> Simplify the convert.h/convert.c logic amd don't touch convert_to_git() The rest is v2 from Lars Lars Schneider (4): strbuf: add xstrdup_toupper() utf8: add function to detect prohibited UTF-16/32 BOM utf8: add function to detect a missing UTF-16/32 BOM convert: add support for 'checkout-encoding' attribute Torsten Bögershausen (1): convert_to_git(): checksafe becomes an integer Documentation/gitattributes.txt | 59 +++++++++++ apply.c | 4 +- convert.c | 210 +++++++++++++++++++++++++++++++++++++--- convert.h | 19 ++-- diff.c | 4 +- environment.c | 2 +- sha1_file.c | 8 +- strbuf.c | 13 +++ strbuf.h | 1 + t/t0028-checkout-encoding.sh | 197 +++++++++++++++++++++++++++++++++++++ utf8.c | 37 +++++++ utf8.h | 25 +++++ 12 files changed, 549 insertions(+), 30 deletions(-) create mode 100755 t/t0028-checkout-encoding.sh -- 2.16.0.rc0.4.ga4e00d4fa4