Merge branch 'master' into ghc7.0

Backend/SHA.hs

@@ -45,7 +45,7 @@ genBackendE size =
 
 shaCommand :: SHASize -> Maybe String
 shaCommand 1 = SysConfig.sha1
-shaCommand 256 = SysConfig.sha256
+shaCommand 256 = Just SysConfig.sha256
 shaCommand 224 = SysConfig.sha224
 shaCommand 384 = SysConfig.sha384
 shaCommand 512 = SysConfig.sha512

Build/Configure.hs

@@ -6,6 +6,7 @@ import System.Directory
 import Data.List
 import System.Cmd.Utils
 import Control.Applicative
+import System.FilePath
 
 import Build.TestConfig
 import Utility.SafeCommand
@@ -26,15 +27,21 @@ tests =
 	, TestCase "bup" $ testCmd "bup" "bup --version >/dev/null"
 	, TestCase "gpg" $ testCmd "gpg" "gpg --version >/dev/null"
 	, TestCase "ssh connection caching" getSshConnectionCaching
-	] ++ shaTestCases [1, 256, 512, 224, 384]
+	] ++ shaTestCases False [1, 512, 224, 384] ++ shaTestCases True [256]
 
-shaTestCases :: [Int] -> [TestCase]
+shaTestCases :: Bool -> [Int] -> [TestCase]
-shaTestCases l = map make l
+shaTestCases required l = map make l
-	where make n =
+	where
-		let
+		make n = TestCase key $ selector key (shacmds n) "</dev/null"
-			cmds = map (\x -> "sha" ++ show n ++ x) ["", "sum"]
+			where
-			key = "sha" ++ show n
+				key = "sha" ++ show n
-		in TestCase key $ maybeSelectCmd key cmds "</dev/null"
+		selector = if required then selectCmd else maybeSelectCmd
+		shacmds n = concatMap (\x -> [x, osxpath </> x]) $
+			map (\x -> "sha" ++ show n ++ x) ["", "sum"]
+		-- Max OSX puts GNU tools outside PATH, so look in
+		-- the location it uses, and remember where to run them
+		-- from.
+		osxpath = "/opt/local/libexec/gnubin"
 
 tmpDir :: String
 tmpDir = "tmp"

debian/changelog

@@ -6,6 +6,8 @@ git-annex (3.20120523) UNRELEASED; urgency=low
     and adds them.
   * Fix display of warning message when encountering a file that uses an
     unsupported backend.
+  * Require that the SHA256 backend can be used when building, since it's the
+    default.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 May 2012 20:55:29 -0400
 

doc/install/OSX.mdwn

@@ -7,9 +7,6 @@ sudo port install git-core ossp-uuid md5sha1sum coreutils pcre
 
 sudo ln -s /opt/local/include/pcre.h  /usr/include/pcre.h # This is hack that allows pcre-light to find pcre
 
-# optional: this will enable the gnu tools, (to give sha224sum etc..., it does not override the BSD userland)
-export PATH=$PATH:/opt/local/libexec/gnubin
-
 git clone git://git-annex.branchable.com/ git-annex
 cd git-annex
 git checkout ghc7.0

doc/testimonials.mdwn

@@ -9,6 +9,13 @@
 <script src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 </div>
 
+<blockquote>
+What excites me about GIT ANNEX is how it fundamentally tracks the
+backup and availability of any data you own, and allows you to share
+data with a large or small audience, ensuring that the data survives.
+</blockquote>
+-- Jason Scott <http://ascii.textfiles.com/archives/3625>
+
 Seen on IRC:
 <pre>
 oh my god, git-annex is amazing