summaryrefslogtreecommitdiff
path: root/Command/Map.hs
diff options
context:
space:
mode:
authorGravatar Fraser Tweedale <frase@frase.id.au>2014-05-16 21:34:43 +1000
committerGravatar Joey Hess <joey@kitenet.net>2014-05-16 15:46:43 -0400
commit905eaa8cf73a52d92edcb62c17abb2ca9bed863e (patch)
tree17f00f9ae395502c992dcc4d989328f460057410 /Command/Map.hs
parenteefa96844ef813b5ef985ff2db361988047546db (diff)
execute remote.<name>.annex-shell on remote, if set
It is useful to be able to specify an alternative git-annex-shell program to execute on the remote, e.g., to run a version not on the PATH. Use remote.<name>.annex-shell if specified, instead of the default "git-annex-shell" i.e., first so-named executable on the PATH.
Diffstat (limited to 'Command/Map.hs')
-rw-r--r--Command/Map.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/Command/Map.hs b/Command/Map.hs
index 7c11fb2ef..81fa35d43 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -22,6 +22,7 @@ import Logs.UUID
import Logs.Trust
import qualified Remote.Helper.Ssh as Ssh
import qualified Utility.Dot as Dot
+import Types.GitConfig
-- a link from the first repository to the second (its remote)
data Link = Link Git.Repo Git.Repo
@@ -203,7 +204,9 @@ tryScan r
configlist = Ssh.onRemote r (pipedconfig, Nothing) "configlist" [] []
manualconfiglist = do
- sshparams <- Ssh.toRepo r [Param sshcmd]
+ g <- fromRepo id
+ let c = extractRemoteGitConfig g (Git.repoDescribe r)
+ sshparams <- Ssh.toRepo r c [Param sshcmd]
liftIO $ pipedconfig "ssh" sshparams
where
sshcmd = cddir ++ " && " ++