URL normalisation corrupts urls where the project name legitimately ends in 'tree/'

robvalk · robvalk · commit a83672d54a2b · 2012-01-10T11:46:00.000+11:00
diff --git a/src/main/java/com/coravy/hudson/plugins/github/GithubUrl.java b/src/main/java/com/coravy/hudson/plugins/github/GithubUrl.java
@@ -20,9 +20,9 @@ private static String normalize(String url) {
         if (StringUtils.isBlank(url)) {
             return null;
         }
-        // Strip "tree/..."
-        if (url.contains("tree/")) {
-            url = url.replaceFirst("tree/.*$", "");
+        // Strip "/tree/..."
+        if (url.contains("/tree/")) {
+            url = url.replaceFirst("/tree/.*$", "");
         }
         if (!url.endsWith("/")) {
             url += '/';

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ private static String normalize(String url) {`
`20`	`20`	`if (StringUtils.isBlank(url)) {`
`21`	`21`	`return null;`
`22`	`22`	`}`
`23`		`- // Strip "tree/..."`
`24`		`- if (url.contains("tree/")) {`
`25`		`- url = url.replaceFirst("tree/.*$", "");`
	`23`	`+ // Strip "/tree/..."`
	`24`	`+ if (url.contains("/tree/")) {`
	`25`	`+ url = url.replaceFirst("/tree/.*$", "");`
`26`	`26`	`}`
`27`	`27`	`if (!url.endsWith("/")) {`
`28`	`28`	`url += '/';`