Merge branch 'cn/bom-in-gitignore'
commit2e1dfd62dca9aecb0ec1bdf3d1927a8da6d95723
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:34 +0000 (5 21:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:34 +0000 (5 21:00 -0700)
tree6f556bbcfcb7fcecea0df2e1b116560a0f5569d7
parent39a5d50d62780e2f838e5fa8196c06fba2baa956
parent27547e5fccda134560ad0441aa5bfa187387cec0
Merge branch 'cn/bom-in-gitignore'

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
attr.c
config.c
dir.c