From 3c971c414e8520dee14ce20d6a5137df20704bc7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 4 Aug 2015 16:53:38 -0400 Subject: [PATCH] sshopts is never going to be null; the concat of it may be --- Annex/Ssh.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index c720a6bb50..161e574d8d 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -280,14 +280,14 @@ sshOptionsTo remote gc g unchanged = return g use opts = do - let sshopts = + let sshopts = concat [ opts , map Param (remoteAnnexSshOptions gc) ] if null sshopts then unchanged else do - let val = toSshOptionsEnv (concat sshopts) + let val = toSshOptionsEnv sshopts command <- liftIO programPath liftIO $ do g' <- addGitEnv g sshOptionsEnv val