From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 May 2015 21:05:51 +0000 (-0700)
Subject: Merge branch 'cn/bom-in-gitignore' into maint
X-Git-Tag: v2.4.1~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8a1d89745d1b60d0d9e8bd91e4e9564673b6c22a

Merge branch 'cn/bom-in-gitignore' into maint

Teach the codepaths that read .gitignore and .gitattributes files
that these files encoded in UTF-8 may have UTF-8 BOM marker at the
beginning; this makes it in line with what we do for configuration
files already.

* cn/bom-in-gitignore:
attr: skip UTF8 BOM at the beginning of the input file
config: use utf8_bom[] from utf.[ch] in git_parse_source()
utf8-bom: introduce skip_utf8_bom() helper
add_excludes_from_file: clarify the bom skipping logic
dir: allow a BOM at the beginning of exclude files
---

8a1d89745d1b60d0d9e8bd91e4e9564673b6c22a