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

Separate out flags when parsing Git arguments

Browse Source 
This will enable us to construct an execution result dictionary similar
to FugitiveResult().
This commit is contained in:
Tim Pope
2021-08-09 23:54:29 -04:00
parent 4adf054a3f
commit 371a5062d3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/fugitive.vim
View File

@@ -415,7 +415,7 @@ let s:prepare_env = {
\ 'core.editor': 'GIT_EDITOR', \ 'core.editor': 'GIT_EDITOR',
\ 'core.askpass': 'GIT_ASKPASS', \ 'core.askpass': 'GIT_ASKPASS',
\ } \ }
function! fugitive#PrepareDirEnvGitArgv(...) abort function! fugitive#PrepareDirEnvGitFlagsArgs(...) abort
if !fugitive#GitVersion(1, 8, 5) if !fugitive#GitVersion(1, 8, 5)
throw 'fugitive: Git 1.8.5 or higher required' throw 'fugitive: Git 1.8.5 or higher required'
endif endif
@@ -432,6 +432,7 @@ function! fugitive#PrepareDirEnvGitArgv(...) abort
call extend(cmd, list_args) call extend(cmd, list_args)
let env = {} let env = {}
let i = 0 let i = 0
let arg_count = 0
while i < len(cmd) while i < len(cmd)
if type(cmd[i]) == type({}) if type(cmd[i]) == type({})
if has_key(cmd[i], 'dir') if has_key(cmd[i], 'dir')
@@ -466,6 +467,7 @@ function! fugitive#PrepareDirEnvGitArgv(...) abort
let explicit_pathspec_option = 1 let explicit_pathspec_option = 1
let i += 1 let i += 1
elseif cmd[i] !~# '^-' elseif cmd[i] !~# '^-'
let arg_count = len(cmd) - i
break break
else else
let i += 1 let i += 1
@@ -475,7 +477,7 @@ function! fugitive#PrepareDirEnvGitArgv(...) abort
let dir = s:Dir() let dir = s:Dir()
endif endif
call s:PreparePathArgs(cmd, dir, !exists('explicit_pathspec_option')) call s:PreparePathArgs(cmd, dir, !exists('explicit_pathspec_option'))
return [dir, env, git, cmd] return [dir, env, git, cmd[0 : -arg_count-1], cmd[-arg_count : -1]]
endfunction endfunction
function! s:BuildEnvPrefix(env) abort function! s:BuildEnvPrefix(env) abort
@@ -524,8 +526,8 @@ function! s:BuildShell(dir, env, git, args) abort
endfunction endfunction
function! fugitive#Prepare(...) abort function! fugitive#Prepare(...) abort
let [dir, env, git, argv] = call('fugitive#PrepareDirEnvGitArgv', a:000) let [dir, env, git, flags, args] = call('fugitive#PrepareDirEnvGitFlagsArgs', a:000)
return s:BuildShell(dir, env, git, argv) return s:BuildShell(dir, env, git, flags + args)
endfunction endfunction
function! s:SystemError(cmd, ...) abort function! s:SystemError(cmd, ...) abort