diff options
| author |  Joey Hess <id@joeyh.name> | 2014-12-03 13:26:05 -0400 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2014-12-03 13:26:05 -0400 |
| commit | cb032f201e0bb1f9710a81fa2980b6221b0ee041 (patch) | |
| tree | 14308f405d25cc5b026e8080125d8c545bec73bb | |
| parent | e7ff8042d68c8e19545844f3c7a7190f043b3915 (diff) | |
Windows: ssh is no longer included in the git-annex bundle, since msysgit includes it.
| -rw-r--r-- | Build/BundledPrograms.hs | 8 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/Uninstalling_removes_libcrypto.dll.mdwn | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index dd78994b0..5eb0b1f28 100644 --- a/Build/BundledPrograms.hs +++ b/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 diff --git a/debian/changelog b/debian/changelog index e1eec146e..cf3c0ee2e 100644 --- a/debian/changelog +++ b/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 diff --git a/doc/bugs/Uninstalling_removes_libcrypto.dll.mdwn b/doc/bugs/Uninstalling_removes_libcrypto.dll.mdwn index 6ee781d2f..642bcef8b 100644 --- a/doc/bugs/Uninstalling_removes_libcrypto.dll.mdwn +++ b/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]] |