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

Patch 8.2.4014
Problem:    Git and gitcommit file types not properly recognized.
Solution:   Adjust filetype detection. (Tim Pope, closes #9477)
Files:      runtime/filetype.vim, runtime/scripts.vim,
            src/testdir/test_filetype.vim


*** ../vim-8.2.4013/runtime/filetype.vim	2022-01-03 17:32:42.683980485 +0000
--- runtime/filetype.vim	2022-01-05 20:53:31.806190023 +0000
***************
*** 497,503 ****
  " Diff files
  au BufNewFile,BufRead *.diff,*.rej		setf diff
  au BufNewFile,BufRead *.patch
! 	\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
  	\   setf gitsendemail |
  	\ else |
  	\   setf diff |
--- 497,503 ----
  " Diff files
  au BufNewFile,BufRead *.diff,*.rej		setf diff
  au BufNewFile,BufRead *.patch
! 	\ if getline(1) =~# '^From [0-9a-f]\{40,\} Mon Sep 17 00:00:00 2001$' |
  	\   setf gitsendemail |
  	\ else |
  	\   setf diff |
***************
*** 676,681 ****
--- 676,682 ----
  
  " 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 */.config/git/config			setf gitconfig
  au BufNewFile,BufRead .gitmodules,*.git/modules/*/config	setf gitconfig
***************
*** 684,695 ****
  endif
  au BufNewFile,BufRead git-rebase-todo		setf gitrebase
  au BufRead,BufNewFile .gitsendemail.msg.??????	setf gitsendemail
- au BufNewFile,BufRead .msg.[0-9]*
-       \ if getline(1) =~ '^From.*# This line is ignored.$' |
-       \   setf gitsendemail |
-       \ endif
  au BufNewFile,BufRead *.git/*
!       \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
        \   setf git |
        \ endif
  
--- 685,692 ----
  endif
  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 |
        \ endif
  
*** ../vim-8.2.4013/runtime/scripts.vim	2021-11-27 17:21:54.085161469 +0000
--- runtime/scripts.vim	2022-01-05 20:53:31.806190023 +0000
***************
*** 384,390 ****
      set ft=scheme
  
    " Git output
!   elseif s:line1 =~# '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$'
      set ft=git
  
     " Gprof (gnu profiler)
--- 384,390 ----
      set ft=scheme
  
    " Git output
!   elseif s:line1 =~# '^\(commit\|tree\|object\) \x\{40,\}\>\|^tag \S\+$'
      set ft=git
  
     " Gprof (gnu profiler)
*** ../vim-8.2.4013/src/testdir/test_filetype.vim	2022-01-03 17:32:42.687980478 +0000
--- src/testdir/test_filetype.vim	2022-01-05 20:53:31.806190023 +0000
***************
*** 195,201 ****
      \ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
      \ 'gemtext': ['file.gmi', 'file.gemini'],
      \ 'gift': ['file.gift'],
!     \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'],
      \ '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'],
      \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
      \ 'gitrebase': ['git-rebase-todo'],
--- 195,201 ----
      \ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
      \ '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'],
      \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
      \ 'gitrebase': ['git-rebase-todo'],
***************
*** 1070,1073 ****
--- 1070,1124 ----
    call delete('debian/patches', 'rf')
  endfunc
  
+ func Test_patch_file()
+   filetype on
+ 
+   call writefile([], 'Xfile.patch')
+   split Xfile.patch
+   call assert_equal('diff', &filetype)
+   bwipe!
+ 
+   call writefile(['From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001'], 'Xfile.patch')
+   split Xfile.patch
+   call assert_equal('gitsendemail', &filetype)
+   bwipe!
+ 
+   call writefile(['From 0000000000000000000000000000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001'], 'Xfile.patch')
+   split Xfile.patch
+   call assert_equal('gitsendemail', &filetype)
+   bwipe!
+ 
+   call delete('Xfile.patch')
+   filetype off
+ endfunc
+ 
+ func Test_git_file()
+   filetype on
+ 
+   call assert_true(mkdir('Xrepo.git', 'p'))
+ 
+   call writefile([], 'Xrepo.git/HEAD')
+   split Xrepo.git/HEAD
+   call assert_equal('', &filetype)
+   bwipe!
+ 
+   call writefile(['0000000000000000000000000000000000000000'], 'Xrepo.git/HEAD')
+   split Xrepo.git/HEAD
+   call assert_equal('git', &filetype)
+   bwipe!
+ 
+   call writefile(['0000000000000000000000000000000000000000000000000000000000000000'], 'Xrepo.git/HEAD')
+   split Xrepo.git/HEAD
+   call assert_equal('git', &filetype)
+   bwipe!
+ 
+   call writefile(['ref: refs/heads/master'], 'Xrepo.git/HEAD')
+   split Xrepo.git/HEAD
+   call assert_equal('git', &filetype)
+   bwipe!
+ 
+   call delete('Xrepo.git', 'rf')
+   filetype off
+ endfunc
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.4013/src/version.c	2022-01-05 20:40:29.325990580 +0000
--- src/version.c	2022-01-05 20:55:40.321681822 +0000
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     4014,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
235. You start naming your kids Pascal, COBOL, Algol and Fortran.

 /// 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    ///