android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixed upload to remotes with the url ssh://hostname"

Browse Source
This commit is contained in:
David Pursehouse 2017-08-30 15:11:22 +00:00 committed by Gerrit Code Review
commit 9d743397bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git_config.py
View File

@ -621,7 +621,7 @@ class Remote(object):
u = self.review u = self.review
if u.startswith('persistent-'): if u.startswith('persistent-'):
u = u[len('persistent-'):] u = u[len('persistent-'):]
if u.split(':')[0] not in ('http', 'https', 'sso'): if u.split(':')[0] not in ('http', 'https', 'sso', 'ssh'):
u = 'http://%s' % u u = 'http://%s' % u
if u.endswith('/Gerrit'): if u.endswith('/Gerrit'):
u = u[:len(u) - len('/Gerrit')] u = u[:len(u) - len('/Gerrit')]
@ -637,7 +637,7 @@ class Remote(object):
host, port = os.environ['REPO_HOST_PORT_INFO'].split() host, port = os.environ['REPO_HOST_PORT_INFO'].split()
self._review_url = self._SshReviewUrl(userEmail, host, port) self._review_url = self._SshReviewUrl(userEmail, host, port)
REVIEW_CACHE[u] = self._review_url REVIEW_CACHE[u] = self._review_url
elif u.startswith('sso:'): elif u.startswith('sso:') or u.startswith('ssh:'):
self._review_url = u # Assume it's right self._review_url = u # Assume it's right
REVIEW_CACHE[u] = self._review_url REVIEW_CACHE[u] = self._review_url
elif 'REPO_IGNORE_SSH_INFO' in os.environ: elif 'REPO_IGNORE_SSH_INFO' in os.environ: