mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

repair: Check git version at run time.

Browse source
This commit is contained in:
Joey Hess 2014-01-21 13:22:48 -04:00
parent b213df2038
commit 78ead70ea4
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Git/Fsck.hs
View file

@ -20,7 +20,7 @@ import Git
import Git.Command import Git.Command
import Git.Sha import Git.Sha
import Utility.Batch import Utility.Batch
import qualified Git.BuildVersion import qualified Git.Version
import qualified Data.Set as S import qualified Data.Set as S
@ -40,12 +40,14 @@ data FsckResults = FsckFoundMissing MissingObjects | FsckFailed
-} -}
findBroken :: Bool -> Repo -> IO FsckResults findBroken :: Bool -> Repo -> IO FsckResults
findBroken batchmode r = do findBroken batchmode r = do
let (command, params) = ("git", fsckParams r) supportsNoDangling <- (>= Git.Version.normalize "1.7.10")
<$> Git.Version.installed
let (command, params) = ("git", fsckParams supportsNoDangling r)
(command', params') <- if batchmode (command', params') <- if batchmode
then toBatchCommand (command, params) then toBatchCommand (command, params)
else return (command, params) else return (command, params)
(output, fsckok) <- processTranscript command' (toCommand params') Nothing (output, fsckok) <- processTranscript command' (toCommand params') Nothing
let objs = findShas output let objs = findShas supportsNoDangling output
badobjs <- findMissing objs r badobjs <- findMissing objs r
if S.null badobjs && not fsckok if S.null badobjs && not fsckok
then return FsckFailed then return FsckFailed
@ -75,21 +77,18 @@ isMissing s r = either (const True) (const False) <$> tryIO dump
, Param (show s) , Param (show s)
] r ] r
findShas :: String -> [Sha] findShas :: Bool -> String -> [Sha]
findShas = catMaybes . map extractSha . concat . map words . filter wanted . lines findShas supportsNoDangling = catMaybes . map extractSha . concat . map words . filter wanted . lines
where where
wanted l wanted l
| supportsNoDangling = True | supportsNoDangling = True
| otherwise = not ("dangling " `isPrefixOf` l) | otherwise = not ("dangling " `isPrefixOf` l)
fsckParams :: Repo -> [CommandParam] fsckParams :: Bool -> Repo -> [CommandParam]
fsckParams = gitCommandLine $ map Param $ catMaybes fsckParams supportsNoDangling = gitCommandLine $ map Param $ catMaybes
[ Just "fsck" [ Just "fsck"
, if supportsNoDangling , if supportsNoDangling
then Just "--no-dangling" then Just "--no-dangling"
else Nothing else Nothing
, Just "--no-reflogs" , Just "--no-reflogs"
] ]
supportsNoDangling :: Bool
supportsNoDangling = not $ Git.BuildVersion.older "1.7.10"

1
debian/changelog vendored
View file

@ -17,6 +17,7 @@ git-annex (5.20140118) UNRELEASED; urgency=medium
* Add numcopiesneeded preferred content expression. * Add numcopiesneeded preferred content expression.
* Client, transfer, incremental backup, and archive repositories * Client, transfer, incremental backup, and archive repositories
now want to get content that does not yet have enough copies. now want to get content that does not yet have enough copies.
* repair: Check git version at run time.
-- Joey Hess <joeyh@debian.org> Sat, 18 Jan 2014 11:54:17 -0400 -- Joey Hess <joeyh@debian.org> Sat, 18 Jan 2014 11:54:17 -0400