Windows: ssh is no longer included in the git-annex bundle, since msysgit includes it.

Build/BundledPrograms.hs

@@ -20,7 +20,7 @@ bundledPrograms :: [FilePath]
 bundledPrograms = catMaybes
 	[ Nothing
 #ifndef mingw32_HOST_OS
-	-- git is not included in the windows bundle
+	-- git is not included in the windows bundle; msysgit is used
 	, Just "git"
 	-- Not strictly needed in PATH by git-annex, but called
 	-- by git when it sshes to a remote.
@@ -31,13 +31,17 @@ bundledPrograms = catMaybes
 	, Just "cp"
 #ifndef mingw32_HOST_OS
 	-- using xargs on windows led to problems, so it's not used there
+	-- (and msysgit includes a copy anyway)
 	, Just "xargs"
 #endif
 	, Just "rsync"
 #ifndef darwin_HOST_OS
+#ifndef mingw32_HOST_OS
 	-- OS X has ssh installed by default.
-	-- (Linux probably, but not guaranteed.)
+	-- Linux probably has ssh, but not guaranteed.
+	-- On Windows, msysgit provides ssh, but not ssh-keygen.
 	, Just "ssh"
+#endif
 	, Just "ssh-keygen"
 #endif
 #ifndef mingw32_HOST_OS

debian/changelog

@@ -18,6 +18,8 @@ git-annex (5.20141126) UNRELEASED; urgency=medium
   * Don't show "(gpg)" when decrypting the remote encryption cipher,
     since this could be taken to read that's the only time git-annex
     runs gpg, which is not the case.
+  * Windows: ssh is no longer included in the git-annex bundle,
+    since msysgit includes it.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 10 Nov 2014 15:31:55 -0400
 

doc/bugs/Uninstalling_removes_libcrypto.dll.mdwn

@@ -20,3 +20,6 @@ Windows 8.
 
 # End of transcript or log.
 """]]
+
+> [[fixed|done]]; git-annex no longer includes its own ssh, and uses the
+> one from msysgit. --[[Joey]]