diff options
| author | ObserverOfTime <chronobserver@disroot.org> | 2022-09-10 11:04:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-10 11:04:24 +0100 |
| commit | 9ba2786f15f0b53a90fd221832a5bedfc6dbfe20 (patch) | |
| tree | c19d4117e873b0f54a1b0c545bde556d3500c2aa | |
| parent | 12553ada3b1ceee0179527abc9980b8392fd6c7e (diff) | |
patch 9.0.0434: gitignore files are not recognizedv9.0.0434
Problem: gitignore files are not recognized.
Solution: Add patterns for the gitignore filetype. (closes #11102)
| -rw-r--r-- | runtime/filetype.vim | 11 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 9c43fb85fd..0223402a4b 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -721,12 +721,15 @@ au BufNewFile,BufRead .gitmodules,*.git/modules/*/config setf gitconfig if !empty($XDG_CONFIG_HOME) au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config setf gitconfig au BufNewFile,BufRead $XDG_CONFIG_HOME/git/attributes setf gitattributes + au BufNewFile,BufRead $XDG_CONFIG_HOME/git/ignore setf gitignore endif au BufNewFile,BufRead .gitattributes,*.git/info/attributes setf gitattributes -au BufNewFile,BufRead */.config/git/attributes setf gitattributes -au BufNewFile,BufRead */etc/gitattributes setf gitattributes -au BufNewFile,BufRead git-rebase-todo setf gitrebase -au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail +au BufNewFile,BufRead */.config/git/attributes setf gitattributes +au BufNewFile,BufRead */etc/gitattributes setf gitattributes +au BufNewFile,BufRead .gitignore,*.git/info/exclude setf gitignore +au BufNewFile,BufRead */.config/git/ignore setf gitignore +au BufNewFile,BufRead git-rebase-todo setf gitrebase +au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail au BufNewFile,BufRead *.git/* \ if getline(1) =~# '^\x\{40,\}\>\|^ref: ' | \ setf git | diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index d2bfa91073..e42b8a0da5 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -216,6 +216,7 @@ let s:filename_checks = { \ 'gitattributes': ['file.git/info/attributes', '.gitattributes', '/.config/git/attributes', '/etc/gitattributes', '/usr/local/etc/gitattributes', 'some.git/info/attributes'], \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'], \ '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', 'any/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'], + \ 'gitignore': ['file.git/info/exclude', '.gitignore', '/.config/git/ignore', 'some.git/info/exclude'], \ '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 51478ad6e3..7b0edde67f 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 434, +/**/ 433, /**/ 432, |