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

sshopts is never going to be null; the concat of it may be

Browse source
This commit is contained in:
Joey Hess 2015-08-04 16:53:38 -04:00
parent 39b876e096
commit 3c971c414e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Annex/Ssh.hs
View file

@ -280,14 +280,14 @@ sshOptionsTo remote gc g
unchanged = return g unchanged = return g
use opts = do use opts = do
let sshopts = let sshopts = concat
[ opts [ opts
, map Param (remoteAnnexSshOptions gc) , map Param (remoteAnnexSshOptions gc)
] ]
if null sshopts if null sshopts
then unchanged then unchanged
else do else do
let val = toSshOptionsEnv (concat sshopts) let val = toSshOptionsEnv sshopts
command <- liftIO programPath command <- liftIO programPath
liftIO $ do liftIO $ do
g' <- addGitEnv g sshOptionsEnv val g' <- addGitEnv g sshOptionsEnv val