Browse Source

Merge pull request #616 from luochen1990/fix-github-url

use github style uri when using git protocol.
revert-616-fix-github-url
Kamran Mackey 11 years ago
parent
commit
19cc800e90
2 changed files with 4 additions and 3 deletions
  1. +3
    -2
      autoload/vundle/config.vim
  2. +1
    -1
      autoload/vundle/scripts.vim

+ 3
- 2
autoload/vundle/config.vim View File

@ -138,10 +138,11 @@ endf
func! s:parse_name(arg)
let arg = a:arg
let git_proto = exists('g:vundle_default_git_proto') ? g:vundle_default_git_proto : 'https'
let github_uri_prefix = (git_proto == 'git' ? 'git@github.com:' : git_proto.'://github.com/')
if arg =~? '^\s*\(gh\|github\):\S\+'
\ || arg =~? '^[a-z0-9][a-z0-9-]*/[^/]\+$'
let uri = git_proto.'://github.com/'.split(arg, ':')[-1]
let uri = github_uri_prefix . split(arg, ':')[-1]
if uri !~? '\.git$'
let uri .= '.git'
endif
@ -153,7 +154,7 @@ func! s:parse_name(arg)
let name = split( substitute(uri,'/\?\.git\s*$','','i') ,'\/')[-1]
else
let name = arg
let uri = git_proto.'://github.com/vim-scripts/'.name.'.git'
let uri = github_uri_prefix . '/vim-scripts/'.name.'.git'
endif
return {'name': name, 'uri': uri, 'name_spec': arg }
endf


+ 1
- 1
autoload/vundle/scripts.vim View File

@ -90,7 +90,7 @@ func! s:create_changelog() abort
call add(changelog, '')
call add(changelog, 'Updated Plugin: '.bundle.name)
if bundle.uri =~ "https://github.com"
if bundle.uri =~ "https://github.com" "TODO: what for git protocol?
call add(changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.initial_sha.'...'.updated_sha)
endif


Loading…
Cancel
Save