diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index aac79c6e93..1c317a933f 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -1701,14 +1701,15 @@ function! s:ReplaceCmd(cmd) abort endfunction function! s:QueryLog(refspec) abort - let lines = s:LinesError(['log', '-n', '256', '--pretty=format:%h%x09%s', a:refspec, '--'])[0] + let lines = s:LinesError(['log', '-n', '256', '--pretty=format:%h%x09%d%x09%s', a:refspec, '--'])[0] call map(lines, 'split(v:val, "\t", 1)') - call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}') + call map(lines, '{"type": "Log", "commit": v:val[0], "ref": v:val[1], "subject": join(v:val[2 : -1], "\t")}') return lines endfunction function! s:FormatLog(dict) abort - return a:dict.commit . ' ' . a:dict.subject + echo a:dict.ref + return a:dict.commit . ((len(a:dict.ref) > 0) ? (a:dict.ref . ' ') : ' ') . a:dict.subject endfunction function! s:FormatRebase(dict) abort diff --git a/syntax/fugitive.vim b/syntax/fugitive.vim index e84eba4e76..f568488954 100644 --- a/syntax/fugitive.vim +++ b/syntax/fugitive.vim @@ -23,8 +23,9 @@ syn match fugitiveDone /^done\>/ contained containedin=@fugitiveSection nextgrou syn match fugitiveStop /^stop\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite syn match fugitiveModifier /^[MADRCU?]\{1,2} / contained containedin=@fugitiveSection syn match fugitiveSymbolicRef /\.\@!\%(\.\.\@!\|[^[:space:][:cntrl:]\:.]\)\+\.\@