vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix argument handling for :Gmerge

Browse Source 
This shouldn't matter in practice since :Gmerge doesn't accept path
arguments, but may as well do the right thing.
This commit is contained in:
Tim Pope 2019-07-09 05:58:34 -04:00
parent cecfc06be3
commit f71a38db7d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/fugitive.vim
View File

@ -3162,8 +3162,8 @@ 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:SplitExpand(a:args)
let dir = a:0 ? a:1 : s:Dir() let dir = a:0 ? a:1 : s:Dir()
let args = s:SplitExpand(a:args, s:Tree(dir))
let mods = s:Mods(a:mods) let mods = s:Mods(a:mods)
if a:cmd =~# '^rebase' && s:HasOpt(args, '-i', '--interactive') if a:cmd =~# '^rebase' && s:HasOpt(args, '-i', '--interactive')
let cmd = fugitive#Prepare(dir, '-c', 'sequence.editor=sh ' . s:RebaseSequenceAborter(), 'rebase') . ' ' . s:shellesc(args) let cmd = fugitive#Prepare(dir, '-c', 'sequence.editor=sh ' . s:RebaseSequenceAborter(), 'rebase') . ' ' . s:shellesc(args)