diff options
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Ssh.hs | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Git/Ssh.hs b/Git/Ssh.hs index 79065f2b4..7d6a305bb 100644 --- a/Git/Ssh.hs +++ b/Git/Ssh.hs @@ -43,10 +43,8 @@ gitSsh host mp cmd = do -- treated the same as GIT_SSH | any isSpace c -> ret "sh" [ [ Param "-c" - , Param (c ++ " \"$@\"") - , Param c + , Param (shellcmd c gitps) ] - , gitps ] | otherwise -> ret c [gitps] Nothing -> do @@ -55,8 +53,16 @@ gitSsh host mp cmd = do Just c -> ret c [gitps] Nothing -> return Nothing where - -- git passes exactly these parameters + ret c ll = return $ Just (c, concat ll) + + -- git passes exactly these parameters to the command gitps = map Param $ case mp of Nothing -> [host, cmd] Just p -> [host, "-p", show p, cmd] - ret c ll = return $ Just (c, concat ll) + + -- The shell command to run with sh -c is constructed + -- this way, rather than using "$@" because there could be some + -- unwanted parameters passed to the command, and this way they + -- are ignored. For example, when Utility.Rsync.rsyncShell is + -- used, rsync adds some parameters after the command. + shellcmd c ps = c ++ " " ++ unwords (map shellEscape (toCommand ps)) |