mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 23:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4188: not all gitconfig files are recognized (#17178)

Browse Source 
Problem:    Not all gitconfig files are recognized.
Solution:   Add a few more patterns. (Tim Pope, closes vim/vim#9597)
bcfa11b7df
This commit is contained in:
Christian Clason
2022-01-23 17:50:45 +01:00
committed by GitHub
parent ffd9551aa2
commit 28352dc6e5
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/filetype.vim
View File

@@ -674,8 +674,10 @@ autocmd BufRead,BufNewFile *.gift setf gift
" Git " Git
au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
au BufNewFile,BufRead NOTES_EDITMSG,EDIT_DESCRIPTION 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 */.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 au BufNewFile,BufRead .gitmodules,*.git/modules/*/config setf gitconfig
if !empty($XDG_CONFIG_HOME) 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

5
runtime/lua/vim/filetype.lua
View File

@@ -893,8 +893,6 @@ local filename = {
["EDIT_DESCRIPTION"] = "gitcommit", ["EDIT_DESCRIPTION"] = "gitcommit",
[".gitconfig"] = "gitconfig", [".gitconfig"] = "gitconfig",
[".gitmodules"] = "gitconfig", [".gitmodules"] = "gitconfig",
["/.config/git/config"] = "gitconfig",
["/etc/gitconfig"] = "gitconfig",
["gitolite.conf"] = "gitolite", ["gitolite.conf"] = "gitolite",
["git-rebase-todo"] = "gitrebase", ["git-rebase-todo"] = "gitrebase",
gkrellmrc = "gkrellmrc", gkrellmrc = "gkrellmrc",
@@ -1149,7 +1147,10 @@ local pattern = {
[".*Eterm/.*%.cfg"] = "eterm", [".*Eterm/.*%.cfg"] = "eterm",
[".*%.git/modules/.*/config"] = "gitconfig", [".*%.git/modules/.*/config"] = "gitconfig",
[".*%.git/config"] = "gitconfig", [".*%.git/config"] = "gitconfig",
[".*/etc/gitconfig"] = "gitconfig",
[".*/%.config/git/config"] = "gitconfig", [".*/%.config/git/config"] = "gitconfig",
[".*%.git/config%.worktree"] = "gitconfig",
[".*%.git/worktrees/.*/config%.worktree"] = "gitconfig",
["%.gitsendemail%.msg%......."] = "gitsendemail", ["%.gitsendemail%.msg%......."] = "gitsendemail",
["gkrellmrc_."] = "gkrellmrc", ["gkrellmrc_."] = "gkrellmrc",
[".*/usr/.*/gnupg/options%.skel"] = "gpg", [".*/usr/.*/gnupg/options%.skel"] = "gpg",

2
src/nvim/testdir/test_filetype.vim
View File

@@ -197,7 +197,7 @@ let s:filename_checks = {
\ 'gemtext': ['file.gmi', 'file.gemini'], \ 'gemtext': ['file.gmi', 'file.gemini'],
\ 'gift': ['file.gift'], \ 'gift': ['file.gift'],
\ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'], \ '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'], \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
\ 'gitrebase': ['git-rebase-todo'], \ 'gitrebase': ['git-rebase-todo'],
\ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'], \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],