luisgulo/vim-plug
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Proper handling of invalid branch in parallel installer

Browse source
This commit is contained in:
Junegunn Choi 2013-09-25 12:45:14 +09:00
parent 8ee3a0b36d
commit d05f75f782
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plug.vim
View file

@ -274,7 +274,7 @@ function! s:update_serial(pull)
if s:git_valid(spec, 0) if s:git_valid(spec, 0)
let result = a:pull ? let result = a:pull ?
\ s:system( \ s:system(
\ printf('git checkout -q %s && git pull origin %s 2>&1', \ printf('git checkout -q %s 2>&1 && git pull origin %s 2>&1',
\ spec.branch, spec.branch)) : 'Already installed' \ spec.branch, spec.branch)) : 'Already installed'
let error = a:pull ? v:shell_error != 0 : 0 let error = a:pull ? v:shell_error != 0 : 0
else else
@ -352,7 +352,8 @@ function! s:update_parallel(pull, threads)
current_uri = `#{cd} #{dir} && git config remote.origin.url`.chomp current_uri = `#{cd} #{dir} && git config remote.origin.url`.chomp
if $? == 0 && current_uri == uri if $? == 0 && current_uri == uri
if pull if pull
[true, `#{cd} #{dir} && git checkout -q #{branch} && git pull origin #{branch} 2>&1`] output = `#{cd} #{dir} && git checkout -q #{branch} 2>&1 && git pull origin #{branch} 2>&1`
[$? == 0, output]
else else
[true, skip] [true, skip]
end end