diff options
| -rw-r--r-- | git_config.py | 2 | ||||
| -rw-r--r-- | project.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/git_config.py b/git_config.py index 17937649..eb532d02 100644 --- a/git_config.py +++ b/git_config.py | |||
| @@ -488,7 +488,7 @@ def close_ssh(): | |||
| 488 | _master_keys_lock = None | 488 | _master_keys_lock = None |
| 489 | 489 | ||
| 490 | URI_SCP = re.compile(r'^([^@:]*@?[^:/]{1,}):') | 490 | URI_SCP = re.compile(r'^([^@:]*@?[^:/]{1,}):') |
| 491 | URI_ALL = re.compile(r'^([a-z][a-z+]*)://([^@/]*@?[^/]*)/') | 491 | URI_ALL = re.compile(r'^([a-z][a-z+-]*)://([^@/]*@?[^/]*)/') |
| 492 | 492 | ||
| 493 | def GetSchemeFromUrl(url): | 493 | def GetSchemeFromUrl(url): |
| 494 | m = URI_ALL.match(url) | 494 | m = URI_ALL.match(url) |
| @@ -1449,6 +1449,8 @@ class Project(object): | |||
| 1449 | remote = self.GetRemote(self.remote.name) | 1449 | remote = self.GetRemote(self.remote.name) |
| 1450 | bundle_url = remote.url + '/clone.bundle' | 1450 | bundle_url = remote.url + '/clone.bundle' |
| 1451 | bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url) | 1451 | bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url) |
| 1452 | if GetSchemeFromUrl(bundle_url) in ('persistent-http', 'persistent-https'): | ||
| 1453 | bundle_url = bundle_url[len('persistent-'):] | ||
| 1452 | if GetSchemeFromUrl(bundle_url) not in ('http', 'https'): | 1454 | if GetSchemeFromUrl(bundle_url) not in ('http', 'https'): |
| 1453 | return False | 1455 | return False |
| 1454 | 1456 | ||
