summaryrefslogtreecommitdiff
path: root/Remote/Git.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-10-16 00:04:26 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-10-16 00:04:26 -0400
commit91366c896d9c9cb4519b451a64ed4d1e0ff52cb3 (patch)
treef9c7073002f68f1b53ba62890794474301a7253a /Remote/Git.hs
parent52c8244219dd90102818282b8b09186f2ce93a0f (diff)
clean Annex stuff out of Utility/
Diffstat (limited to 'Remote/Git.hs')
-rw-r--r--Remote/Git.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 10183522f..8857d821d 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -13,7 +13,7 @@ import qualified Data.Map as M
import Common.Annex
import Utility.CopyFile
import Utility.RsyncFile
-import Utility.Ssh
+import Annex.Ssh
import Types.Remote
import qualified Git
import qualified Annex
@@ -164,7 +164,7 @@ copyFromRemote :: Git.Repo -> Key -> FilePath -> Annex Bool
copyFromRemote r key file
| not $ Git.repoIsUrl r = rsyncOrCopyFile r (gitAnnexLocation r key) file
| Git.repoIsSsh r = rsyncHelper =<< rsyncParamsRemote r True key file
- | Git.repoIsHttp r = Url.download (keyUrl r key) file
+ | Git.repoIsHttp r = liftIO $ Url.download (keyUrl r key) file
| otherwise = error "copying from non-ssh, non-http repo not supported"
{- Tries to copy a key's content to a remote's annex. -}