patch 8.2.4188: not all gitconfig files are recognized

Problem:    Not all gitconfig files are recognized.
Solution:   Add a few more patterns. (Tim Pope, closes #9597)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 15fd7f4ab426f8729b89f5779bfc77f03d5a6739..51f62f4fe049517d0ffd9e3cf37592da8448fc16 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -678,8 +678,10 @@ autocmd BufRead,BufNewFile *.gift          setf gift
 " Git
 au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG     setf gitcommit
 au BufNewFile,BufRead NOTES_EDITMSG,EDIT_DESCRIPTION           setf gitcommit
-au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig   setf gitconfig
+au BufNewFile,BufRead *.git/config,.gitconfig,*/etc/gitconfig  setf gitconfig
 au BufNewFile,BufRead */.config/git/config                     setf gitconfig
+au BufNewFile,BufRead *.git/config.worktree                    setf gitconfig
+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

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index fb1aa6349a6dd047a84d9f1456fbb652ff0f1afb..d0a1fd23ac92e5d1b69bba30f42342d60cd6c607 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -197,7 +197,7 @@ let s:filename_checks = {
     \ 'gemtext': ['file.gmi', 'file.gemini'],
     \ 'gift': ['file.gift'],
     \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
-    \ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'],
+    \ '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', '/.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'],
     \ 'gitrebase': ['git-rebase-todo'],
     \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],

diff --git a/src/version.c b/src/version.c
index 1d5160f5e78e8a870510f9bfa54a743c3bff7464..59721bb1c129dbeb5d41f70c0bf01b4e30f83b11 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4188,
 /**/
     4187,
 /**/