summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-05-07 07:26:45 -0600
committerJames Moger <james.moger@gitblit.com>2014-05-07 07:26:45 -0600
commite2d9cd97a7c1749e739bd973a85165c096162971 (patch)
tree25a9a7bb5b45d9856e3601bde19d5e5e3b357b6e /src/main/java/com/gitblit
parenta341a5e8d5080142583fc03ea34dc1db7eb10364 (diff)
parentb016de996e77b3d7b6e68d8442c47a50e2a3d2eb (diff)
downloadgitblit-e2d9cd97a7c1749e739bd973a85165c096162971.tar.gz
gitblit-e2d9cd97a7c1749e739bd973a85165c096162971.zip
Merged #63 "Internal error when git.sshPort=22"
Diffstat (limited to 'src/main/java/com/gitblit')
-rw-r--r--src/main/java/com/gitblit/Constants.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index af533996..e4d92e1a 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -554,7 +554,12 @@ public class Constants {
}
public static Transport fromUrl(String url) {
- String scheme = url.substring(0, url.indexOf("://"));
+ int delim = url.indexOf("://");
+ if (delim == -1) {
+ // if no protocol is specified, SSH is assumed by git clients
+ return SSH;
+ }
+ String scheme = url.substring(0, delim);
return fromString(scheme);
}
}