diff options
| author | James Moger <james.moger@gitblit.com> | 2014-05-07 09:28:20 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-05-07 09:28:20 -0400 |
| commit | 337e2a0406d56b0b05012eb8e3bc1a393502f714 (patch) | |
| tree | 36d5f424b491dc0cb5bee9c322a8de2a6506cf92 | |
| parent | 5b0358f1c233becfa9e703a3ab3c962bdb81846e (diff) | |
| parent | b016de996e77b3d7b6e68d8442c47a50e2a3d2eb (diff) | |
| download | gitblit-337e2a0406d56b0b05012eb8e3bc1a393502f714.tar.gz gitblit-337e2a0406d56b0b05012eb8e3bc1a393502f714.zip | |
Merge branch 'ticket/63' into develop
| -rw-r--r-- | releases.moxie | 3 | ||||
| -rw-r--r-- | src/main/distrib/data/clientapps.json | 11 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/Constants.java | 7 | ||||
| -rw-r--r-- | src/main/resources/tortoise32.png | bin | 0 -> 1225 bytes |
4 files changed, 20 insertions, 1 deletions
diff --git a/releases.moxie b/releases.moxie index 62a71c6e..c750cbaa 100644 --- a/releases.moxie +++ b/releases.moxie @@ -16,6 +16,7 @@ r23: { - 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 @@ r23: { - 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 a19cbcc8..b5c25f17 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 4b9755f3..a5e76a51 100644 --- a/src/main/java/com/gitblit/Constants.java +++ b/src/main/java/com/gitblit/Constants.java @@ -556,7 +556,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);
}
}
diff --git a/src/main/resources/tortoise32.png b/src/main/resources/tortoise32.png Binary files differnew file mode 100644 index 00000000..40aa9786 --- /dev/null +++ b/src/main/resources/tortoise32.png |
