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

Support older Git in :Gpull

Browse Source 
Closes #645.
This commit is contained in:
Tim Pope 2015-05-19 11:12:13 -04:00
parent b0e38f08dc
commit c2908b174d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/fugitive.vim
View File

@ -1176,13 +1176,15 @@ function! s:Merge(cmd, bang, args) abort
\ !empty(s:repo().git_chomp('diff-files', '--diff-filter=U'))) \ !empty(s:repo().git_chomp('diff-files', '--diff-filter=U')))
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(g:fugitive_git_executable.' -c core.editor=false '. let &l:makeprg = s:sub(g:fugitive_git_executable . ' ' . a:cmd .
\ a:cmd . (a:args =~# ' \%(--no-edit\|--abort\|-m\)\>' ? '' : ' --edit') . ' ' . a:args, \ (a:args =~# ' \%(--no-edit\|--abort\|-m\)\>' ? '' : ' --edit') .
\ ' *$', '') \ ' ' . a:args, ' *$', '')
endif endif
if !empty($GIT_EDITOR) if !empty($GIT_EDITOR) || has('win32')
let old_editor = $GIT_EDITOR let old_editor = $GIT_EDITOR
let $GIT_EDITOR = 'false' let $GIT_EDITOR = 'false'
else
let &l:makeprg = 'env GIT_EDITOR=false ' . &l:makeprg
endif endif
execute cd fnameescape(s:repo().tree()) execute cd fnameescape(s:repo().tree())
silent noautocmd make! silent noautocmd make!