| commit | 8a1d89745d1b60d0d9e8bd91e4e9564673b6c22a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 May 2015 21:05:51 +0000 (13 14:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 May 2015 21:05:51 +0000 (13 14:05 -0700) | ||
| tree | eef6bd2437ba2a1188dbe1b4023b27ef99531b65 | treesnapshot (tar.gz zip) |
| parent | ebb464f0cba9efcb5552fad02f452f09f68fc9b2 | commitdiff |
| parent | 27547e5fccda134560ad0441aa5bfa187387cec0 | commitdiff |
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
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 | diff1 | diff2 | blobhistory |
| config.c | diff1 | diff2 | blobhistory |
| dir.c | diff1 | diff2 | blobhistory |