diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-13 14:05:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-13 14:05:51 -0700 |
| commit | 8a1d89745d1b60d0d9e8bd91e4e9564673b6c22a (patch) | |
| tree | eef6bd2437ba2a1188dbe1b4023b27ef99531b65 /mergesort.c | |
| parent | Merge branch 'jk/prune-mtime' into maint (diff) | |
| parent | attr: skip UTF8 BOM at the beginning of the input file (diff) | |
| download | tgif-8a1d89745d1b60d0d9e8bd91e4e9564673b6c22a.tar.xz | |
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
Diffstat (limited to 'mergesort.c')
0 files changed, 0 insertions, 0 deletions