diff options
| author | Tim Pope <code@tpope.net> | 2022-01-23 11:28:16 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-23 11:28:16 +0000 |
| commit | bcfa11b7dfdfbb4d412dd843a6da3fce68ba2e39 (patch) | |
| tree | 30466d30e8d229d7f3bc630568e03f3234c534b0 | |
| parent | ff5cbe8133c6eb5dd86b9e042f32f589627e9bf9 (diff) | |
| download | vim-git-8.2.4188.tar.gz | |
patch 8.2.4188: not all gitconfig files are recognizedv8.2.4188
Problem: Not all gitconfig files are recognized.
Solution: Add a few more patterns. (Tim Pope, closes #9597)
| -rw-r--r-- | runtime/filetype.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 15fd7f4ab..51f62f4fe 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -678,8 +678,10 @@ autocmd BufRead,BufNewFile *.gift setf gift " Git au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG 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 *.git/config.worktree setf gitconfig +au BufNewFile,BufRead *.git/worktrees/*/config.worktree 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 diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index fb1aa6349..d0a1fd23a 100644 --- a/src/testdir/test_filetype.vim +++ b/src/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'], diff --git a/src/version.c b/src/version.c index 1d5160f5e..59721bb1c 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4188, +/**/ 4187, /**/ 4186, |