patch 9.0.0424: gitattributes files are not recognized

Problem:    gitattributes files are not recognized.
Solution:   Add patterns to match gitattributes files. (closes #11085)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f445d7cb058a15890368e98c6fc42d9aab9f7636..d9e1433270ab7daa1efcc366ec7ba5d5babbb8b5 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -720,7 +720,11 @@ au BufNewFile,BufRead *.git/worktrees/*/config.worktree            setf gitconfig
 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
 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 *.git/*

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 33b0894b2a1b815d6f468dd62f2f68b65caa27f5..b70a9fe8750e260aa63e6bc7cea9479148e151f4 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -213,6 +213,7 @@ let s:filename_checks = {
     \ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
     \ 'gemtext': ['file.gmi', 'file.gemini'],
     \ 'gift': ['file.gift'],
+    \ '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'],
     \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],

diff --git a/src/version.c b/src/version.c
index 445ac6dde5496da46130f5c88637e2db871146d1..24c99fd4e7d9a26be9d630d33252501f3c51f586 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 */
+/**/
+    424,
 /**/
     423,
 /**/