sync, remotedaemon: Pass configured ssh-options even when annex.sshcaching is disabled.

Annex/Ssh.hs

@@ -271,20 +271,23 @@ sshOptionsTo remote gc g
 		Just host -> do
 			(msockfile, _) <- sshCachingInfo (host, Git.Url.port remote)
 			case msockfile of
-				Nothing -> return g
+				Nothing -> use []
 				Just sockfile -> do
-					command <- liftIO programPath
 					prepSocket sockfile
-					let val = toSshOptionsEnv $ concat
-						[ sshConnectionCachingParams sockfile
-						, map Param (remoteAnnexSshOptions gc)
-						]
-					liftIO $ do
-						g' <- addGitEnv g sshOptionsEnv val
-						addGitEnv g' "GIT_SSH" command
+					use (sshConnectionCachingParams sockfile)
   where
 	uncached = return g
 
+	use opts = do
+		let val = toSshOptionsEnv $ concat
+			[ opts
+			, map Param (remoteAnnexSshOptions gc)
+			]
+		command <- liftIO programPath
+		liftIO $ do
+			g' <- addGitEnv g sshOptionsEnv val
+			addGitEnv g' "GIT_SSH" command
+
 runSshOptions :: [String] -> String -> IO ()
 runSshOptions args s = do
 	let args' = toCommand (fromSshOptionsEnv s) ++ args

debian/changelog

@@ -2,6 +2,8 @@ git-annex (5.20150529) UNRELEASED; urgency=medium
 
   * fromkey, registerurl: Improve handling of urls that happen to also
     be parsable as strange keys.
+  * sync, remotedaemon: Pass configured ssh-options even when
+    annex.sshcaching is disabled.
 
  -- Joey Hess <id@joeyh.name>  Sat, 30 May 2015 02:07:18 -0400