mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-15 23:03:51 -05:00
Only target current file if range is given to :Glog
This commit is contained in:
@@ -3111,24 +3111,19 @@ function! s:Log(cmd, bang, line1, line2, ...) abort
|
||||
let before = substitute(args, ' --\S\@!.*', '', '')
|
||||
let after = strpart(args, len(before))
|
||||
let path = s:Relative('/')
|
||||
let relative = path[1:-1]
|
||||
if path =~# '^/\.git\%(/\|$\)' || len(after)
|
||||
if path =~# '^/\.git\%(/\|$\)' || a:line2 < 0
|
||||
let path = ''
|
||||
elseif a:line2 > 0
|
||||
let before .= ' -L ' . s:shellesc(a:line1 . ',' . a:line2 . ':' . path[1:-1])
|
||||
else
|
||||
let after = (len(after) > 3 ? after : ' -- ') . path[1:-1]
|
||||
endif
|
||||
if before !~# '\s[^[:space:]-]'
|
||||
if len(path) && before !~# '\s[^[:space:]-]'
|
||||
let owner = s:Owner(@%)
|
||||
if len(owner)
|
||||
let before .= ' ' . s:shellesc(owner)
|
||||
endif
|
||||
endif
|
||||
if relative =~# '^\.git\%(/\|$\)'
|
||||
let relative = ''
|
||||
endif
|
||||
if len(relative) && a:line2 > 0
|
||||
let before .= ' -L ' . s:shellesc(a:line1 . ',' . a:line2 . ':' . relative)
|
||||
elseif len(relative) && (empty(after) || a:line2 == 0)
|
||||
let after = (len(after) > 3 ? after : ' -- ') . relative
|
||||
endif
|
||||
let grepformat = &grepformat
|
||||
let grepprg = &grepprg
|
||||
try
|
||||
@@ -3138,12 +3133,6 @@ function! s:Log(cmd, bang, line1, line2, ...) abort
|
||||
\ s:shellesc('--pretty=format:fugitive://'.s:Dir().'//%H'.path.'::'.format), '%#')
|
||||
let &grepformat = '%Cdiff %.%#,%C--- %.%#,%C+++ %.%#,%Z@@ -%\d%\+\,%\d%\+ +%l\,%\d%\+ @@,%-G-%.%#,%-G+%.%#,%-G %.%#,%A%f::%m,%-G%.%#'
|
||||
exe a:cmd . (a:bang ? '! ' : ' ') . s:ShellExpand(before . after)
|
||||
if len(path) && a:line2 == -1
|
||||
redraw
|
||||
echohl WarningMsg
|
||||
echo ':Glog will soon default to all files. Use :0Glog to target current file'
|
||||
echohl NONE
|
||||
endif
|
||||
finally
|
||||
let &grepformat = grepformat
|
||||
let &grepprg = grepprg
|
||||
|
||||
Reference in New Issue
Block a user