Merge branch 'cn/bom-in-gitignore' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:51 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:51 +0000 (14:05 -0700)
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

1  2 
attr.c
config.c
dir.c

diff --cc attr.c
Simple merge
diff --cc config.c
Simple merge
diff --cc dir.c
Simple merge