From 337e2a0406d56b0b05012eb8e3bc1a393502f714 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 May 2014 09:28:20 -0400
Subject: [PATCH] Merge branch 'ticket/63' into develop
---
src/main/distrib/data/clientapps.json | 11 +++++++++++
src/main/java/com/gitblit/Constants.java | 7 ++++++-
releases.moxie | 3 +++
src/main/resources/tortoise32.png | 0
4 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 62a71c6..c750cba 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -16,6 +16,7 @@
- Fix forcing default locale to en or LANG_CC for web ui (ticket-51)
- Fix inconsistency with repository ownership permission checking (ticket-52)
- Prevent submission from New|Edit ticket page with empty titles (ticket-53)
+ - Fix transport determination for SSH urls served on port 22 (issue-421, ticket-63)
changes:
- improve French translation (pr-176)
- simplify current plugin release detection and ignore the currentRelease registry field
@@ -31,6 +32,8 @@
- Olivier Rouits
- Owen Nelson
- Alexander Zabluda
+ - Philipp Beckmann
+ - Jakob Boysen
}
#
diff --git a/src/main/distrib/data/clientapps.json b/src/main/distrib/data/clientapps.json
index a19cbcc..b5c25f1 100644
--- a/src/main/distrib/data/clientapps.json
+++ b/src/main/distrib/data/clientapps.json
@@ -89,5 +89,16 @@
"icon": "sparkleshare_32x32.png",
"minimumPermission" : "RW+",
"isActive": false
+ },
+ {
+ "name": "TortoiseGit",
+ "title": "TortoiseGit",
+ "description": "Windows Shell Interface to Git",
+ "legal": "released under the GPLv2 open source license",
+ "cloneUrl": "tgit://clone/${repoUrl}",
+ "productUrl": "http://www.tortoisegit.org",
+ "platforms": [ "windows" ],
+ "icon": "tortoise32.png",
+ "isActive": true
}
]
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 4b9755f..a5e76a5 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -556,7 +556,12 @@
}
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);
}
}
diff --git a/src/main/resources/tortoise32.png b/src/main/resources/tortoise32.png
new file mode 100644
index 0000000..40aa978
--- /dev/null
+++ b/src/main/resources/tortoise32.png
Binary files differ
--
Gitblit v1.9.1