From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 May 2015 04:00:34 +0000 (-0700)
Subject: Merge branch 'cn/bom-in-gitignore'
X-Git-Tag: v2.5.0-rc0~149
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=2e1dfd62dca9aecb0ec1bdf3d1927a8da6d95723;p=git.git

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

2e1dfd62dca9aecb0ec1bdf3d1927a8da6d95723