motiejus/dotfiles

commit f71a38db7d298cc55f628ff2e0b752ed516a7ae8 (tree)
parent cecfc06be3be7522a8e551f2f0ce5c22f59cba74
Author: Tim Pope <code@tpope.net>
Date:   Tue,  9 Jul 2019 05:58:34 -0400

Fix argument handling for :Gmerge

This shouldn't matter in practice since :Gmerge doesn't accept path
arguments, but may as well do the right thing.

Diffstat:
M
autoload/fugitive.vim
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -3162,8 +3162,8 @@ function! s:RebaseEdit(cmd, dir) abort
 endfunction
 
 function! s:Merge(cmd, bang, mods, args, ...) abort
-  let args = s:SplitExpand(a:args)
   let dir = a:0 ? a:1 : s:Dir()
+  let args = s:SplitExpand(a:args, s:Tree(dir))
   let mods = s:Mods(a:mods)
   if a:cmd =~# '^rebase' && s:HasOpt(args, '-i', '--interactive')
     let cmd = fugitive#Prepare(dir, '-c', 'sequence.editor=sh ' . s:RebaseSequenceAborter(), 'rebase') . ' ' . s:shellesc(args)