aboutsummaryrefslogtreecommitdiff
path: root/src
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 /src
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 'src')
-rw-r--r--src/nvim/testdir/test_filetype.vim2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index b5fa362e48..8930d62fd3 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/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'],