TW-53230 fix url for VSO

diff --git a/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/WellKnownHostingsUtil.java b/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/WellKnownHostingsUtil.java
index 99978c243f1452a27adc04304aa4e61368e83077..713301efe6e294e10182abce27c0e4d6c7561ce9 100644 (file)
--- a/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/WellKnownHostingsUtil.java
+++ b/git-server/src/jetbrains/buildServer/buildTriggers/vcs/git/WellKnownHostingsUtil.java
@@ -104,7 +104,7 @@ public final class WellKnownHostingsUtil {
 
     String repoName = path.substring(gitPrefixIdx + "_git/".length());
 
-    return new VcsHostingRepo("https://" + host + "/_git/" + repoName, owner, repoName);
+    return new VcsHostingRepo("https://" + host + path, owner, repoName);
   }
 
   private static VcsHostingRepo ownerProjectStyleRepo(@NotNull String hostingUrl, @NotNull URIish uri) {

diff --git a/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/WellKnownHostingsTest.java b/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/WellKnownHostingsTest.java
index 6c5cf2f0e79a4cd8b613efce50574e1e913b3cfd..00018e9ea86f56583f5af809a74b377dd1f0c4e7 100644 (file)
--- a/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/WellKnownHostingsTest.java
+++ b/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/WellKnownHostingsTest.java
@@ -115,4 +115,13 @@ public class WellKnownHostingsTest extends BaseTestCase {
     assertEquals("spav5", repo.owner());
     assertEquals("MyFirstProject", repo.repoName());
   }
+
+  public void test_vsts_nested_project() throws URISyntaxException {
+    String url = "https://spav5.visualstudio.com/MyProject/_git/MyFirstProject";
+    VcsHostingRepo repo = WellKnownHostingsUtil.getVSTSRepo(new URIish(url));
+    assertNotNull(repo);
+    assertEquals("https://spav5.visualstudio.com/MyProject/_git/MyFirstProject", repo.repositoryUrl());
+    assertEquals("spav5", repo.owner());
+    assertEquals("MyFirstProject", repo.repoName());
+  }
 }