add git version check to configure

Rather ugly dotted version comparison method, but it does work.

2 files changed, 25 insertions, 1 deletions

diff --git a/configure.hs b/configure.hs
index b68fa12db..1d1c02335 100644
--- a/configure.hs
+++ b/configure.hs
@@ -2,12 +2,16 @@
 
 import System.Directory
 import Data.List
+import Data.String.Utils
+import System.Cmd.Utils
 
 import Build.TestConfig
 
 tests :: [TestCase]
 tests =
 	[ TestCase "version" getVersion
+	, TestCase "git" $ requireCmd "git" "git --version >/dev/null"
+	, TestCase "git version" checkGitVersion
 	, testCp "cp_a" "-a"
 	, testCp "cp_p" "-p"
 	, testCp "cp_reflink_auto" "--reflink=auto"
@@ -53,6 +57,26 @@ getVersionString = do
 	where
 		middle = drop 1 . init
 
+{- Checks for a new enough version of git. -}
+checkGitVersion :: Test
+checkGitVersion = do
+	(_, s) <- pipeFrom "git" ["--version"]
+	let version = last $ words $ head $ lines s
+	if dotted version < dotted need
+		then error $ "git version " ++ version ++ " too old; need " ++ need
+		else return $ Config "gitversion" (StringConfig version)
+	where
+		-- for git-check-attr behavior change
+		need = "1.7.7"
+		dotted = sum . mult 1 . reverse . extend 10 . map readi . split "." 
+		extend n l = l ++ take (n - length l) (repeat 0)
+		mult _ [] = []
+		mult n (x:xs) = (n*x) : (mult (n*100) xs)
+		readi :: String -> Integer
+		readi s = case reads s of
+			((x,_):_) -> x
+			_ -> 0
+
 {- Set up cabal file with version. -}
 cabalSetup :: IO ()
 cabalSetup = do
diff --git a/git-annex.cabal b/git-annex.cabal
index 5645eb043..450adea75 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 3.20110929
+Version: 3.20111011
 Cabal-Version: >= 1.6
 License: GPL
 Maintainer: Joey Hess <joey@kitenet.net>