Github/vim-plug
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show errors

Browse Source
This commit is contained in:
Yasuhiro Matsumoto 2020-02-20 13:50:21 +09:00
parent fe0a986c84
commit 47ad80685a
No known key found for this signature in database
GPG Key ID: 622DE34DC490584B
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plug.vim
View File

@ -2226,13 +2226,17 @@ function! s:git_validate(spec, check_branch)
if isdirectory(a:spec.dir) if isdirectory(a:spec.dir)
let result = [s:git_get_branch(a:spec.dir), s:git_get_remote_origin_url(a:spec.dir)] let result = [s:git_get_branch(a:spec.dir), s:git_get_remote_origin_url(a:spec.dir)]
let remote = result[-1] let remote = result[-1]
if !s:compare_git_uri(remote, a:spec.uri) if type(remote) ==# v:t_null
let err = join([remote, 'PlugClean required.'], "\n")
elseif !s:compare_git_uri(remote, a:spec.uri)
let err = join(['Invalid URI: '.remote, let err = join(['Invalid URI: '.remote,
\ 'Expected: '.a:spec.uri, \ 'Expected: '.a:spec.uri,
\ 'PlugClean required.'], "\n") \ 'PlugClean required.'], "\n")
elseif a:check_branch && has_key(a:spec, 'commit') elseif a:check_branch && has_key(a:spec, 'commit')
let sha = [s:git_get_revision(a:spec.dir)] let sha = s:git_get_revision(a:spec.dir)
if !s:hash_match(sha, a:spec.commit) if type(sha) == v:t_null
let err = join(add(result, 'PlugClean required.'), "\n")
elseif !s:hash_match(sha, a:spec.commit)
let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', let err = join([printf('Invalid HEAD (expected: %s, actual: %s)',
\ a:spec.commit[:6], sha[:6]), \ a:spec.commit[:6], sha[:6]),
\ 'PlugUpdate required.'], "\n") \ 'PlugUpdate required.'], "\n")