From a54680251b71513b6ea919cfeeb35ec97d769f22 Mon Sep 17 00:00:00 2001 From: Kamran Mackey Date: Wed, 8 Jul 2015 14:57:26 -0600 Subject: [PATCH] Revert "use github style uri when using git protocol." --- autoload/vundle/config.vim | 5 ++--- autoload/vundle/scripts.vim | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index c520a55..e1fb4ca 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -138,7 +138,6 @@ 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 =~? '@' let revision = split(arg, '@')[-1] @@ -149,7 +148,7 @@ func! s:parse_name(arg) if arg =~? '^\s*\(gh\|github\):\S\+' \ || arg =~? '^[a-z0-9][a-z0-9-]*/[^/]\+$' - let uri = github_uri_prefix . split(arg, ':')[-1] + let uri = git_proto.'://github.com/'.split(arg, ':')[-1] if uri !~? '\.git$' let uri .= '.git' endif @@ -161,7 +160,7 @@ func! s:parse_name(arg) let name = split( substitute(uri,'/\?\.git\s*$','','i') ,'\/')[-1] else let name = arg - let uri = github_uri_prefix . '/vim-scripts/'.name.'.git' + let uri = git_proto.'://github.com/vim-scripts/'.name.'.git' endif return {'name': name, 'uri': uri, 'name_spec': arg, 'revision': revision } endf diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index c40e90f..5d56476 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -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" "TODO: what for git protocol? + if bundle.uri =~ "https://github.com" call add(changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.initial_sha.'...'.updated_sha) endif