Skip to content

Commit d474686

Browse files
committed
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)
1 parent 5f57bdc commit d474686

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

runtime/filetype.vim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -613,12 +613,12 @@ au BufNewFile,BufRead *.mo,*.gdmo setf gdmo
613613
au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
614614

615615
" Git
616-
au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
617-
au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
618-
au BufNewFile,BufRead *.git/modules/*/config setf gitconfig
619-
au BufNewFile,BufRead */.config/git/config setf gitconfig
616+
au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
617+
au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig setf gitconfig
618+
au BufNewFile,BufRead */.config/git/config setf gitconfig
619+
au BufNewFile,BufRead .gitmodules,*.git/modules/*/config setf gitconfig
620620
if !empty($XDG_CONFIG_HOME)
621-
au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config setf gitconfig
621+
au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config setf gitconfig
622622
endif
623623
au BufNewFile,BufRead git-rebase-todo setf gitrebase
624624
au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail

src/testdir/test_filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ let s:filename_checks = {
171171
\ 'gdmo': ['file.mo', 'file.gdmo'],
172172
\ 'gedcom': ['file.ged', 'lltxxxxx.txt'],
173173
\ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'],
174-
\ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config'],
174+
\ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig'],
175175
\ 'gitolite': ['gitolite.conf'],
176176
\ 'gitrebase': ['git-rebase-todo'],
177177
\ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,8 @@ static char *(features[]) =
792792

793793
static int included_patches[] =
794794
{ /* Add new patch number below this line */
795+
/**/
796+
498,
795797
/**/
796798
497,
797799
/**/

0 commit comments

Comments
 (0)