8000 Merge pull request #110 from kad/flex-ssh-urls · github-cloud/github-plugin@d49f0cb · GitHub
[go: up one dir, main page]
Skip to content

Commit d49f0cb

Browse files
lanwenlanwen
committed
Merge pull request jenkinsci#110 from kad/flex-ssh-urls
Handle ssh:// URLs that doesn't contain git@
2 parents c43344a + 1087b7b commit d49f0cb

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

‎src/main/java/com/cloudbees/jenkins/GitHubRepositoryName.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class GitHubRepositoryName {
4949
Pattern.compile("https?://[^/]+@([^/]+)/([^/]+)/([^/]+)\\.git"),
5050
Pattern.compile("https?://([^/]+)/([^/]+)/([^/]+)\\.git"),
5151
Pattern.compile("git://([^/]+)/([^/]+)/([^/]+)\\.git"),
52-
Pattern.compile("ssh://git@([^/]+)/([^/]+)/([^/]+)\\.git"),
52+
Pattern.compile("ssh://(?:git@)?([^/]+)/([^/]+)/([^/]+)\\.git"),
5353
/**
5454
* The second set of patterns extract the host, owner and repository names
5555
* from all other URLs. Note that these patterns must be processed *after*
@@ -60,7 +60,7 @@ public class GitHubRepositoryName {
6060
Pattern.compile("https?://[^/]+@([^/]+)/([^/]+)/([^/]+)/?"),
6161
Pattern.compile("https?://([^/]+)/([^/]+)/([^/]+)/?"),
6262
Pattern.compile("git://([^/]+)/([^/]+)/([^/]+)/?"),
63-
Pattern.compile("ssh://git@([^/]+)/([^/]+)/([^/]+)/?")
63+
Pattern.compile("ssh://(?:git@)?([^/]+)/([^/]+)/([^/]+)/?")
6464
};
6565

6666
/**

‎src/test/java/com/coravy/hudson/plugins/github/GitHubRepositoryNameTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ public class GitHubRepositoryNameTest {
4949
"https://github.com/jenkinsci/jenkins.git, github.com, jenkinsci, jenkins",
5050
"https://github.com/jenkinsci/jenkins, github.com, jenkinsci, jenkins",
5151
"https://github.com/jenkinsci/jenkins/, github.com, jenkinsci, jenkins",
52+
"ssh://git@github.com/jenkinsci/jenkins.git, github.com, jenkinsci, jenkins",
53+
"ssh://git@github.com/jenkinsci/jenkins, github.com, jenkinsci, jenkins",
54+
"ssh://git@github.com/jenkinsci/jenkins/, github.com, jenkinsci, jenkins",
55+
"ssh://github.com/jenkinsci/jenkins.git, github.com, jenkinsci, jenkins",
56+
"ssh://github.com/jenkinsci/jenkins, github.com, jenkinsci, jenkins",
57+
"ssh://github.com/jenkinsci/jenkins/, github.com, jenkinsci, jenkins",
5258
})
5359
public void githubFullRepo(String url, String host, String user, String repo) {
5460
assertThat(url, repo(allOf(

0 commit comments

Comments
 (0)
0