Skip to content

Commit 7d56cfc

Browse files
ObserverOfTimebrammool
authored andcommitted
patch 9.0.0424: gitattributes files are not recognized
Problem: gitattributes files are not recognized. Solution: Add patterns to match gitattributes files. (closes #11085)
1 parent 9132426 commit 7d56cfc

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

runtime/filetype.vim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,11 @@ au BufNewFile,BufRead *.git/worktrees/*/config.worktree setf gitconfig
720720
au BufNewFile,BufRead .gitmodules,*.git/modules/*/config setf gitconfig
721721
if !empty($XDG_CONFIG_HOME)
722722
au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config setf gitconfig
723+
au BufNewFile,BufRead $XDG_CONFIG_HOME/git/attributes setf gitattributes
723724
endif
725+
au BufNewFile,BufRead .gitattributes,*.git/info/attributes setf gitattributes
726+
au BufNewFile,BufRead */.config/git/attributes setf gitattributes
727+
au BufNewFile,BufRead */etc/gitattributes setf gitattributes
724728
au BufNewFile,BufRead git-rebase-todo setf gitrebase
725729
au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail
726730
au BufNewFile,BufRead *.git/*

src/testdir/test_filetype.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ let s:filename_checks = {
213213
\ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
214214
\ 'gemtext': ['file.gmi', 'file.gemini'],
215215
\ 'gift': ['file.gift'],
216+
\ 'gitattributes': ['file.git/info/attributes', '.gitattributes', '/.config/git/attributes', '/etc/gitattributes', '/usr/local/etc/gitattributes', 'some.git/info/attributes'],
216217
\ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
217218
\ 'gitconfig': ['file.git/config', 'file.git/config.worktree', 'file.git/worktrees/x/config.worktree', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/usr/local/etc/gitconfig', '/etc/gitconfig.d/file', 'any/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'],
218219
\ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,8 @@ static char *(features[]) =
703703

704704
static int included_patches[] =
705705
{ /* Add new patch number below this line */
706+
/**/
707+
424,
706708
/**/
707709
423,
708710
/**/

0 commit comments

Comments
 (0)