Merge pull request #75 from tzachs/master

Added support to detect trigger for repos that end with .git
jenkinsci · Jul 23, 2020 · 3f5bd22 · 3f5bd22
2 parents 362c8d4 + 377b41f
commit 3f5bd22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>bitbucket</artifactId>
-    <version>1.1.12-SNAPSHOT</version>
+    <version>1.1.13-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>Jenkins Bitbucket Plugin</name>
     <description>integrate Jenkins with BitBucket.</description>

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java b/src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java
@@ -98,10 +98,15 @@ private boolean match(SCM scm, URIish url) {
                     if (StringUtils.isEmpty(url.getHost())) {
                     	urIish = urIish.setHost(url.getHost());
                     }
-                    
+
                     LOGGER.log(Level.FINE, "Trying to match {0} ", urIish.toString() + "<-->" + url.toString());
                     if (GitStatus.looselyMatches(urIish, url)) {
                         return true;
+                    } else if ( urIish.getPath().endsWith(".git.git")){
+                        LOGGER.log(Level.FINE, "Repo ends with .git.git, removing last .git");
+                        urIish = urIish.setPath(urIish.getPath().substring(0,urIish.getPath().length()-4));
+                        LOGGER.log(Level.FINE, "Trying to match {0} ", urIish.toString() + "<-->" + url.toString());
+                        return GitStatus.looselyMatches(urIish, url);
                     }
                 }
             }