To: vim_dev@googlegroups.com
Subject: Patch 9.0.0434
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0434
Problem:    gitignore files are not recognized.
Solution:   Add patterns for the gitignore filetype. (closes #11102)
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-9.0.0433/runtime/filetype.vim	2022-09-09 16:10:23.462536073 +0100
--- runtime/filetype.vim	2022-09-10 10:57:28.380644319 +0100
***************
*** 721,732 ****
  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
  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 *.git/*
        \ if getline(1) =~# '^\x\{40,\}\>\|^ref: ' |
        \   setf git |
--- 721,735 ----
  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 .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 |
*** ../vim-9.0.0433/src/testdir/test_filetype.vim	2022-09-09 16:10:23.462536073 +0100
--- src/testdir/test_filetype.vim	2022-09-10 10:57:28.380644319 +0100
***************
*** 216,221 ****
--- 216,222 ----
      \ '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'],
*** ../vim-9.0.0433/src/version.c	2022-09-10 10:42:16.128909156 +0100
--- src/version.c	2022-09-10 11:02:48.844551070 +0100
***************
*** 705,706 ****
--- 705,708 ----
  {   /* Add new patch number below this line */
+ /**/
+     434,
  /**/

-- 
Know this story about a nerd who fell into a river and drowned,
despite his cries of "F1! F1!"?

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///