mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

support ssh://host/~/dir

Browse source 
When generating the path for rsync, /~/ is not valid, so change to
just host:dir

Note that git remotes specified in host:dir form are internally converted
to the ssh:// url form, so this was especially needed..
This commit is contained in:
Joey Hess 2013-09-26 15:02:27 -04:00
parent 109f2ccc8a
commit e0b99f3960
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Remote/GCrypt.hs
View file

@ -149,8 +149,11 @@ rsyncTransport r
where where
loc = Git.repoLocation r loc = Git.repoLocation r
sshtransport (host, path) = do sshtransport (host, path) = do
let rsyncpath = if "/~/" `isPrefixOf` path
then drop 3 path
else path
opts <- sshCachingOptions (host, Nothing) [] opts <- sshCachingOptions (host, Nothing) []
return (rsyncShell $ Param "ssh" : opts, host ++ ":" ++ path, AccessShell) return (rsyncShell $ Param "ssh" : opts, host ++ ":" ++ rsyncpath, AccessShell)
othertransport = return ([], loc, AccessDirect) othertransport = return ([], loc, AccessDirect)
noCrypto :: Annex a noCrypto :: Annex a