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

Use proper argument parsing in :Gmerge/:Grebase

Browse Source
This commit is contained in:
Tim Pope
2019-07-06 11:19:08 -04:00
parent 2503a957ff
commit f33ac1b2a7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
autoload/fugitive.vim
View File

@@ -3034,11 +3034,11 @@ function! s:RebaseEdit(cmd, dir) abort
endfunction endfunction
function! s:Merge(cmd, bang, mods, args, ...) abort function! s:Merge(cmd, bang, mods, args, ...) abort
let args = s:shellesc(s:SplitExpand(a:args)) let args = s:SplitExpand(a:args)
let dir = a:0 ? a:1 : s:Dir() let dir = a:0 ? a:1 : s:Dir()
let mods = s:Mods(a:mods) let mods = s:Mods(a:mods)
if a:cmd =~# '^rebase' && ' '.args =~# ' -i\| --interactive' if a:cmd =~# '^rebase' && s:HasOpt(args, '-i', '--interactive')
let cmd = fugitive#Prepare(dir, '-c', 'sequence.editor=sh ' . s:RebaseSequenceAborter(), 'rebase') . ' ' . args let cmd = fugitive#Prepare(dir, '-c', 'sequence.editor=sh ' . s:RebaseSequenceAborter(), 'rebase') . ' ' . s:shellesc(args)
let out = system(cmd)[0:-2] let out = system(cmd)[0:-2]
for file in ['end', 'msgnum'] for file in ['end', 'msgnum']
let file = fugitive#Find('.git/rebase-merge/' . file, dir) let file = fugitive#Find('.git/rebase-merge/' . file, dir)
@@ -3052,9 +3052,9 @@ function! s:Merge(cmd, bang, mods, args, ...) abort
return '' return ''
endif endif
return s:RebaseEdit(mods . 'split', dir) return s:RebaseEdit(mods . 'split', dir)
elseif a:cmd =~# '^rebase' && ' '.args =~# ' --edit-todo' && filereadable(fugitive#Find('.git/rebase-merge/git-rebase-todo', dir)) elseif a:cmd =~# '^rebase' && s:HasOpt(args, '--edit-todo') && filereadable(fugitive#Find('.git/rebase-merge/git-rebase-todo', dir))
return s:RebaseEdit(mods . 'split', dir) return s:RebaseEdit(mods . 'split', dir)
elseif a:cmd =~# '^rebase' && ' '.args =~# ' --continue' && !a:0 elseif a:cmd =~# '^rebase' && s:HasOpt(args, '--continue') && !a:0
let rdir = fugitive#Find('.git/rebase-merge', dir) let rdir = fugitive#Find('.git/rebase-merge', dir)
let exec_error = s:ChompError([dir, 'diff-index', '--cached', '--quiet', 'HEAD', '--'])[1] let exec_error = s:ChompError([dir, 'diff-index', '--cached', '--quiet', 'HEAD', '--'])[1]
if exec_error && isdirectory(rdir) if exec_error && isdirectory(rdir)
@@ -3096,9 +3096,9 @@ function! s:Merge(cmd, bang, mods, args, ...) abort
let &l:makeprg = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U' let &l:makeprg = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U'
else else
let &l:makeprg = s:sub(s:UserCommand() . ' ' . a:cmd . let &l:makeprg = s:sub(s:UserCommand() . ' ' . a:cmd .
\ (' ' . args =~# ' \%(--no-edit\|--abort\|-m\)\>' || a:cmd =~# '^rebase' ? '' : ' --edit') . \ (s:HasOpt(args, '--no-edit', '--abort', '-m') || a:cmd =~# '^rebase' ? '' : ' --edit') .
\ (' ' . args =~# ' --autosquash\>' && a:cmd =~# '^rebase' ? ' --interactive' : '') . \ (s:HasOpt(args, '--autosquash') && a:cmd =~# '^rebase' ? ' --interactive' : '') .
\ ' ' . args, ' *$', '') \ ' ' . s:shellesc(args), ' *$', '')
endif endif
if !empty($GIT_SEQUENCE_EDITOR) || has('win32') if !empty($GIT_SEQUENCE_EDITOR) || has('win32')
let old_sequence_editor = $GIT_SEQUENCE_EDITOR let old_sequence_editor = $GIT_SEQUENCE_EDITOR