patch 9.0.0434: gitignore files are not recognized

Problem:    gitignore files are not recognized.
Solution:   Add patterns for the gitignore filetype. (closes #11102)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9c43fb85fdddef98be6ba25b55a67d79c8884e2e..0223402a4be97a9710d333bc58d77e2f11894456 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -721,12 +721,15 @@ au BufNewFile,BufRead .gitmodules,*.git/modules/*/config  setf gitconfig
 if !empty($XDG_CONFIG_HOME)
   au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config            setf gitconfig
   au BufNewFile,BufRead $XDG_CONFIG_HOME/git/attributes                setf gitattributes
+  au BufNewFile,BufRead $XDG_CONFIG_HOME/git/ignore            setf gitignore
 endif
 au BufNewFile,BufRead .gitattributes,*.git/info/attributes     setf gitattributes
-au BufNewFile,BufRead */.config/git/attributes                 setf gitattributes
-au BufNewFile,BufRead */etc/gitattributes                      setf gitattributes
-au BufNewFile,BufRead git-rebase-todo          setf gitrebase
-au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail
+au BufNewFile,BufRead */.config/git/attributes                 setf gitattributes
+au BufNewFile,BufRead */etc/gitattributes                      setf gitattributes
+au BufNewFile,BufRead .gitignore,*.git/info/exclude            setf gitignore
+au BufNewFile,BufRead */.config/git/ignore                     setf gitignore
+au BufNewFile,BufRead git-rebase-todo                          setf gitrebase
+au BufRead,BufNewFile .gitsendemail.msg.??????                 setf gitsendemail
 au BufNewFile,BufRead *.git/*
       \ if getline(1) =~# '^\x\{40,\}\>\|^ref: ' |
       \   setf git |

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d2bfa91073f70a4951d72ed37818ca7aa9dfe699..e42b8a0da53e102796acfdec06588e47da3ad276 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -216,6 +216,7 @@ let s:filename_checks = {
     \ 'gitattributes': ['file.git/info/attributes', '.gitattributes', '/.config/git/attributes', '/etc/gitattributes', '/usr/local/etc/gitattributes', 'some.git/info/attributes'],
     \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
     \ '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'],
+    \ 'gitignore': ['file.git/info/exclude', '.gitignore', '/.config/git/ignore', 'some.git/info/exclude'],
     \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
     \ 'gitrebase': ['git-rebase-todo'],
     \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],

diff --git a/src/version.c b/src/version.c
index 51478ad6e3a86a329d5b657f7b5085bf9318f398..7b0edde67f609dd532bede99c01e3be7dd146f9f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -703,6 +703,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    434,
 /**/
     433,
 /**/