diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-05 15:47:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-05 15:47:00 -0400 |
| commit | 6c1607ce66fb456880495d9026fa368ad48eda3e (patch) | |
| tree | 85a35c24aa718b90a9c11b6d59686d9a0acd7103 /Command/Map.hs | |
| parent | aad1372880ba32f1161a0d05422008cba38bb412 (diff) | |
Support ssh remotes with a port specified.
Diffstat (limited to 'Command/Map.hs')
| -rw-r--r-- | Command/Map.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Command/Map.hs b/Command/Map.hs index fbc48392a..6c3e0b3df 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -22,6 +22,7 @@ import Types import Utility import UUID import Trust +import Ssh import qualified Dot -- a link from the first repository to the second (its remote) @@ -204,13 +205,11 @@ tryScan r configlist = Remotes.onRemote r (pipedconfig, Nothing) "configlist" [] manualconfiglist = do - sshoptions <- Annex.repoConfig r "ssh-options" "" let sshcmd = "cd " ++ shellEscape(Git.workTree r) ++ " && " ++ "git config --list" - liftIO $ pipedconfig "ssh" $ map Param $ - words sshoptions ++ - [Git.urlAuthority r, sshcmd] + sshparams <- sshToRepo r [Param sshcmd] + liftIO $ pipedconfig "ssh" sshparams -- First, try sshing and running git config manually, -- only fall back to git-annex-shell configlist if that |