aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-01-23 17:50:45 +0100
committerGitHub <noreply@github.com>2022-01-23 17:50:45 +0100
commit28352dc6e50b9559f32f054c56dc950a79ae45bc (patch)
tree9eb6d62da9616f29fab258a1c4e7fc0a4417cc12 /runtime/lua/vim
parentffd9551aa210ecd652044ad3c43eb480858f191a (diff)
downloadrneovim-28352dc6e50b9559f32f054c56dc950a79ae45bc.tar.gz
rneovim-28352dc6e50b9559f32f054c56dc950a79ae45bc.tar.bz2
rneovim-28352dc6e50b9559f32f054c56dc950a79ae45bc.zip
vim-patch:8.2.4188: not all gitconfig files are recognized (#17178)
Problem: Not all gitconfig files are recognized. Solution: Add a few more patterns. (Tim Pope, closes vim/vim#9597) https://github.com/vim/vim/commit/bcfa11b7dfdfbb4d412dd843a6da3fce68ba2e39
Diffstat (limited to 'runtime/lua/vim')
-rw-r--r--runtime/lua/vim/filetype.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 060022bce1..736ecc1ff7 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -893,8 +893,6 @@ local filename = {
["EDIT_DESCRIPTION"] = "gitcommit",
[".gitconfig"] = "gitconfig",
[".gitmodules"] = "gitconfig",
- ["/.config/git/config"] = "gitconfig",
- ["/etc/gitconfig"] = "gitconfig",
["gitolite.conf"] = "gitolite",
["git-rebase-todo"] = "gitrebase",
gkrellmrc = "gkrellmrc",
@@ -1149,7 +1147,10 @@ local pattern = {
[".*Eterm/.*%.cfg"] = "eterm",
[".*%.git/modules/.*/config"] = "gitconfig",
[".*%.git/config"] = "gitconfig",
+ [".*/etc/gitconfig"] = "gitconfig",
[".*/%.config/git/config"] = "gitconfig",
+ [".*%.git/config%.worktree"] = "gitconfig",
+ [".*%.git/worktrees/.*/config%.worktree"] = "gitconfig",
["%.gitsendemail%.msg%......."] = "gitsendemail",
["gkrellmrc_."] = "gkrellmrc",
[".*/usr/.*/gnupg/options%.skel"] = "gpg",