Rename gitlog filetype to git

ftdetect/git.vim

@@ -9,11 +9,11 @@ augroup FTgit
                 \ endif
     autocmd BufNewFile,BufRead *.git/**
                 \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
-                \ set ft=gitlog |
+                \ set ft=git |
                 \ endif
     autocmd BufNewFile,BufRead *
                 \ if getline(1) =~ '^\(commit\|tree\|object\) \x\{40\}$' ||
                 \    getline(1)."\n".getline(2) =~ '^tag .*\nTagger: ' |
-                \ set ft=gitlog |
+                \ set ft=git |
                 \ endif
 augroup END

ftplugin/gitlog.vim → ftplugin/git.vim

@@ -1,5 +1,5 @@
 " Vim filetype plugin
-" Language:	git log
+" Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
 " Last Change:	2008 Feb 27
 

ftplugin/gitcommit.vim

@@ -8,7 +8,7 @@ if (exists("b:did_ftplugin"))
   finish
 endif
 
-runtime! ftplugin/gitlog.vim
+runtime! ftplugin/git.vim
 let b:did_ftplugin = 1
 
 if &textwidth == 0
@@ -64,5 +64,5 @@ function! s:gitdiffcached(bang,gitdir,...)
     let b:git_dir = a:gitdir
     command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>)
     nnoremap <silent> q :q<CR>
-    setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=gitlog
+    setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
 endfunction

ftplugin/gitrebase.vim

@@ -8,7 +8,7 @@ if (exists("b:did_ftplugin"))
     finish
 endif
 
-runtime! ftplugin/gitlog.vim
+runtime! ftplugin/git.vim
 let b:did_ftplugin = 1
 
 setlocal comments=:# commentstring=#\ %s formatoptions-=t

syntax/git.vim

@@ -0,0 +1,61 @@
+" Vim syntax file
+" Language:	generic git output
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
+" Last Change:	2008 Feb 27
+
+if exists("b:current_syntax")
+    finish
+endif
+
+syn case match
+syn sync minlines=50
+
+syn include @gitDiff syntax/diff.vim
+
+syn region gitHead start=/\%^/ end=/^$/
+syn region gitHead start=/\%(^commit \x\{40\}$\)\@=/ end=/^$/
+if getline(1) =~ '^\x\{40\} \x\{40\} '
+    " raw reflog: match everything to avoid sync issues
+    syn region gitHead start=/^/ end=/$/
+endif
+
+syn region gitDiff start=/\%(^diff --git \)\@=/ end=/^$/ contains=@gitDiff fold
+
+syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite
+syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite
+syn match  gitKeyword /\<\%(blob\|tree\)\>/ contained nextgroup=gitHash skipwhite
+syn match  gitMode    /^\d\{6\}/ contained containedin=gitHead nextgroup=gitKeyword skipwhite
+syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\)\>/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
+syn match  gitIdentityHeader /^\%(Author\|Commit\|Tagger\):/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
+syn match  gitDateHeader /^\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitHead nextgroup=gitDate skipwhite
+syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
+syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
+
+syn match  gitReflogHeader /^Reflog:/ contained containedin=gitHead nextgroup=gitReflogMiddle skipwhite
+syn match  gitReflogHeader /^Reflog message:/ contained containedin=gitHead skipwhite
+syn match  gitReflogMiddle /\S\+@{\d\+} (/he=e-2 nextgroup=gitIdentity
+
+syn match  gitDate      /\<\u\l\l \u\l\l \d\d \d\d:\d\d:\d\d \d\d\d\d [+-]\d\d\d\d/ contained
+syn match  gitDate      /-\=\d\+ [+-]\d\d\d\d\>/               contained
+syn match  gitDate      /\<\d\+ \l\+ ago\>/                    contained
+syn match  gitType      /\<\%(tag\|commit\|tree\|blob\)\>/     contained
+syn match  gitReference /\S\+\S\@!/                            contained
+syn match  gitHash      /\<\x\{40\}\>/                         contained nextgroup=gitIdentity skipwhite
+syn match  gitHash      /^\<\x\{40\}\>/ containedin=gitHead contained nextgroup=gitHash skipwhite
+
+hi def link gitDateHeader        gitIdentityHeader
+hi def link gitIdentityHeader    gitIdentityKeyword
+hi def link gitIdentityKeyword   Label
+hi def link gitReflogHeader      gitKeyword
+hi def link gitKeyword           Keyword
+hi def link gitIdentity          String
+hi def link gitEmailDelimiter    Delimiter
+hi def link gitEmail             Special
+hi def link gitDate              Number
+hi def link gitMode              Number
+hi def link gitHash              Identifier
+hi def link gitReflogMiddle      gitReference
+hi def link gitReference         Function
+hi def link gitType              Type
+
+let b:current_syntax = "git"