m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-11 04:53:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle custom Git executable for :Git --paginate

Browse Source
This commit is contained in:
Tim Pope
2020-02-22 19:58:48 -05:00
parent c0aad3ac78
commit 2acea41bef
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/fugitive.vim
View File

@@ -2469,7 +2469,7 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
let pager = fugitive#PagerFor(args, config) let pager = fugitive#PagerFor(args, config)
endif endif
if a:bang || pager is# 1 if a:bang || pager is# 1
return s:OpenExec(editcmd, a:mods, env, flags + args, dir) . after return s:OpenExec(editcmd, a:mods, env, args, options) . after
endif endif
if s:HasOpt(args, ['add', 'checkout', 'commit', 'stage', 'stash', 'reset'], '-p', '--patch') || if s:HasOpt(args, ['add', 'checkout', 'commit', 'stage', 'stash', 'reset'], '-p', '--patch') ||
\ s:HasOpt(args, ['add', 'clean', 'stage'], '-i', '--interactive') || \ s:HasOpt(args, ['add', 'clean', 'stage'], '-i', '--interactive') ||
@@ -4410,11 +4410,11 @@ function! s:BlurStatus() abort
endfunction endfunction
function! s:OpenExec(cmd, mods, env, args, ...) abort function! s:OpenExec(cmd, mods, env, args, ...) abort
let dir = a:0 ? s:Dir(a:1) : s:Dir() let options = a:0 ? a:1 : {'dir': s:Dir()}
let temp = tempname() let temp = tempname()
let columns = get(g:, 'fugitive_columns', 80) let columns = get(g:, 'fugitive_columns', 80)
let env = s:BuildEnvPrefix(extend({'COLUMNS': columns}, a:env)) let env = s:BuildEnvPrefix(extend({'COLUMNS': columns}, a:env))
silent! execute '!' . escape(env . s:UserCommand(dir, ['--no-pager'] + a:args), '!#%') . silent! execute '!' . escape(env . s:UserCommand(options, ['--no-pager'] + a:args), '!#%') .
\ (&shell =~# 'csh' ? ' >& ' . temp : ' > ' . temp . ' 2>&1') \ (&shell =~# 'csh' ? ' >& ' . temp : ' > ' . temp . ' 2>&1')
redraw! redraw!
let temp = s:Resolve(temp) let temp = s:Resolve(temp)
@@ -4424,13 +4424,13 @@ function! s:OpenExec(cmd, mods, env, args, ...) abort
else else
let filetype = 'git' let filetype = 'git'
endif endif
let s:temp_files[s:cpath(temp)] = { 'dir': dir, 'filetype': filetype } let s:temp_files[s:cpath(temp)] = { 'dir': options.dir, 'filetype': filetype }
if a:cmd ==# 'edit' if a:cmd ==# 'edit'
call s:BlurStatus() call s:BlurStatus()
endif endif
silent execute s:Mods(a:mods) . a:cmd temp silent execute s:Mods(a:mods) . a:cmd temp
call fugitive#ReloadStatus(dir, 1) call fugitive#ReloadStatus(options.dir, 1)
return 'echo ' . string(':!' . s:UserCommand(dir, a:args)) return 'echo ' . string(':!' . s:UserCommand(options, a:args))
endfunction endfunction
function! fugitive#Open(cmd, bang, mods, arg, args) abort function! fugitive#Open(cmd, bang, mods, arg, args) abort