aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-14 12:46:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-14 12:46:09 -0400
commit5d4052d0e05d391d2ebd167b528133ade726eb3b (patch)
treeff9798c19f11c3867c1d9ee1fd0a7d4e80924222
parent5ec3cea05961e4d9fc3484746860415126db5365 (diff)
Support remotes using git+ssh and ssh+git as protocol. Closes: #607056
-rw-r--r--GitRepo.hs2
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 1 deletions
diff --git a/GitRepo.hs b/GitRepo.hs
index 3cbeae192..1ce6b8aec 100644
--- a/GitRepo.hs
+++ b/GitRepo.hs
@@ -122,7 +122,9 @@ repoIsUrl _ = False
repoIsSsh :: Repo -> Bool
repoIsSsh Repo { location = Url url }
| uriScheme url == "ssh:" = True
+ -- git treats these the same as ssh
| uriScheme url == "git+ssh:" = True
+ | uriScheme url == "ssh+git:" = True
| otherwise = False
repoIsSsh _ = False
diff --git a/debian/changelog b/debian/changelog
index c9f47273f..582c05d2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ git-annex (0.13) UNRELEASED; urgency=low
* Makefile: Install man page and html (when built).
* Makefile: Add GHCFLAGS variable.
* Fix upgrade from 0.03.
- * Support remotes using git+ssh:// as protocol. Closes: #607056
+ * Support remotes using git+ssh and ssh+git as protocol.
+ Closes: #607056
-- Joey Hess <joeyh@debian.org> Sun, 12 Dec 2010 13:14:58 -0400