patch 8.1.0498: /etc/gitconfig not recognized at a gitconfig file

Problem:    /etc/gitconfig not recognized at a gitconfig file.
Solution:   Add pattern to filetype detection. (closes #3568)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 218b01fb6503527f949ef5315efd78dce0d17a4d..af27c85d888b46261b282af672d5ba29dac55740 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -613,12 +613,12 @@ au BufNewFile,BufRead *.mo,*.gdmo         setf gdmo
 au BufNewFile,BufRead *.ged,lltxxxxx.txt       setf gedcom
 
 " Git
-au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
-au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
-au BufNewFile,BufRead *.git/modules/*/config   setf gitconfig
-au BufNewFile,BufRead */.config/git/config     setf gitconfig
+au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG     setf gitcommit
+au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig   setf gitconfig
+au BufNewFile,BufRead */.config/git/config                     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/config            setf gitconfig
 endif
 au BufNewFile,BufRead git-rebase-todo          setf gitrebase
 au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3240f1f1d4544024e81478303aea5243c4196ca5..9c537646f55417ea2ff83c6e908862a80b7ad8e2 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -171,7 +171,7 @@ let s:filename_checks = {
     \ 'gdmo': ['file.mo', 'file.gdmo'],
     \ 'gedcom': ['file.ged', 'lltxxxxx.txt'],
     \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'],
-    \ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config'],
+    \ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig'],
     \ 'gitolite': ['gitolite.conf'],
     \ 'gitrebase': ['git-rebase-todo'],
     \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],

diff --git a/src/version.c b/src/version.c
index c3f2e23918308f9aeae4b2b9a4bf90bc11561fc2..c867ecf3907abafb5f4f34c55a961b32cb0fdbb6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    498,
 /**/
     497,
 /**/