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

Generalize :Git environment variable overrides

Browse Source
This commit is contained in:
Tim Pope
2020-01-14 20:55:00 -05:00
parent 3e32a55619
commit 4732bb964a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
autoload/fugitive.vim
View File

@@ -414,9 +414,7 @@ function! fugitive#PrepareDirEnvArgv(...) abort
return [dir, env, cmd] return [dir, env, cmd]
endfunction endfunction
function! s:BuildShell(dir, env, args) abort function! s:BuildEnvPrefix(env) abort
let cmd = copy(a:args)
let tree = s:Tree(a:dir)
let pre = '' let pre = ''
for [var, val] in items(a:env) for [var, val] in items(a:env)
if s:winshell() if s:winshell()
@@ -425,6 +423,13 @@ function! s:BuildShell(dir, env, args) abort
let pre = (len(pre) ? pre : 'env ') . var . '=' . s:shellesc(val) . ' ' let pre = (len(pre) ? pre : 'env ') . var . '=' . s:shellesc(val) . ' '
endif endif
endfor endfor
return pre
endfunction
function! s:BuildShell(dir, env, args) abort
let cmd = copy(a:args)
let tree = s:Tree(a:dir)
let pre = s:BuildEnvPrefix(a:env)
if empty(tree) || index(cmd, '--') == len(cmd) - 1 if empty(tree) || index(cmd, '--') == len(cmd) - 1
call insert(cmd, '--git-dir=' . FugitiveGitPath(a:dir)) call insert(cmd, '--git-dir=' . FugitiveGitPath(a:dir))
elseif fugitive#GitVersion(1, 8, 5) elseif fugitive#GitVersion(1, 8, 5)
@@ -2209,13 +2214,14 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg) abort
return 'exe ' . string(mods . 'terminal ' . (a:line2 ? '' : '++curwin ') . join(map(s:UserCommandList(dir) + args, 's:fnameescape(v:val)'))) . assign . after return 'exe ' . string(mods . 'terminal ' . (a:line2 ? '' : '++curwin ') . join(map(s:UserCommandList(dir) + args, 's:fnameescape(v:val)'))) . assign . after
endif endif
endif endif
let env = get(opts, 'env', {})
if has('gui_running') && !has('win32') if has('gui_running') && !has('win32')
call insert(args, '--no-pager') call insert(args, '--no-pager')
endif endif
let pre = '' if has('nvim')
if has('nvim') && executable('env') let env.GIT_TERMINAL_PROMPT = '0'
let pre .= 'env GIT_TERMINAL_PROMPT=0 '
endif endif
let pre = s:BuildEnvPrefix(env)
return 'exe ' . string('noautocmd !' . escape(pre . s:UserCommand(dir, args), '!#%')) . return 'exe ' . string('noautocmd !' . escape(pre . s:UserCommand(dir, args), '!#%')) .
\ '|call fugitive#ReloadStatus(' . string(dir) . ', 1)' . \ '|call fugitive#ReloadStatus(' . string(dir) . ', 1)' .
\ after \ after