summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-08 16:16:46 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-08 16:16:46 -0400
commit8014dafedf59f7feaac4153af5e330ab84a9cf8b (patch)
treeb20dbce6053d5d04fd8e751cca26c2448ca4482f
parentf24097e765a8f2af03d24a3aa0e8a6e5c1f561cc (diff)
support gcrypt remotes (assuming them to be over ssh transport)
-rw-r--r--Git/GCrypt.hs5
-rw-r--r--RemoteDaemon/Transport.hs2
2 files changed, 6 insertions, 1 deletions
diff --git a/Git/GCrypt.hs b/Git/GCrypt.hs
index 156441dae..fb99cf619 100644
--- a/Git/GCrypt.hs
+++ b/Git/GCrypt.hs
@@ -16,8 +16,11 @@ import qualified Git.Config as Config
import qualified Git.Command as Command
import Utility.Gpg
+urlScheme :: String
+urlScheme = "gcrypt:"
+
urlPrefix :: String
-urlPrefix = "gcrypt::"
+urlPrefix = urlScheme ++ ":"
isEncrypted :: Repo -> Bool
isEncrypted Repo { location = Url url } = urlPrefix `isPrefixOf` show url
diff --git a/RemoteDaemon/Transport.hs b/RemoteDaemon/Transport.hs
index 1bac7f877..09118ca8b 100644
--- a/RemoteDaemon/Transport.hs
+++ b/RemoteDaemon/Transport.hs
@@ -9,6 +9,7 @@ module RemoteDaemon.Transport where
import RemoteDaemon.Types
import qualified RemoteDaemon.Transport.Ssh
+import qualified Git.GCrypt
import qualified Data.Map as M
@@ -18,4 +19,5 @@ type TransportScheme = String
remoteTransports :: M.Map TransportScheme Transport
remoteTransports = M.fromList
[ ("ssh:", RemoteDaemon.Transport.Ssh.transport)
+ , (Git.GCrypt.urlScheme, RemoteDaemon.Transport.Ssh.transport)
]