Skip to content

Commit 9ba2786

Browse files
ObserverOfTimebrammool
authored andcommitted
patch 9.0.0434: gitignore files are not recognized
Problem: gitignore files are not recognized. Solution: Add patterns for the gitignore filetype. (closes #11102)
1 parent 12553ad commit 9ba2786

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

runtime/filetype.vim

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -721,12 +721,15 @@ 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
723723
au BufNewFile,BufRead $XDG_CONFIG_HOME/git/attributes setf gitattributes
724+
au BufNewFile,BufRead $XDG_CONFIG_HOME/git/ignore setf gitignore
724725
endif
725726
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
728-
au BufNewFile,BufRead git-rebase-todo setf gitrebase
729-
au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail
727+
au BufNewFile,BufRead */.config/git/attributes setf gitattributes
728+
au BufNewFile,BufRead */etc/gitattributes setf gitattributes
729+
au BufNewFile,BufRead .gitignore,*.git/info/exclude setf gitignore
730+
au BufNewFile,BufRead */.config/git/ignore setf gitignore
731+
au BufNewFile,BufRead git-rebase-todo setf gitrebase
732+
au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail
730733
au BufNewFile,BufRead *.git/*
731734
\ if getline(1) =~# '^\x\{40,\}\>\|^ref: ' |
732735
\ setf git |

src/testdir/test_filetype.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ let s:filename_checks = {
216216
\ 'gitattributes': ['file.git/info/attributes', '.gitattributes', '/.config/git/attributes', '/etc/gitattributes', '/usr/local/etc/gitattributes', 'some.git/info/attributes'],
217217
\ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
218218
\ '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'],
219+
\ 'gitignore': ['file.git/info/exclude', '.gitignore', '/.config/git/ignore', 'some.git/info/exclude'],
219220
\ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
220221
\ 'gitrebase': ['git-rebase-todo'],
221222
\ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],

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+
434,
706708
/**/
707709
433,
708710
/**/

0 commit comments

Comments
 (0)