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

merge from git-repair

Browse source
This commit is contained in:
Joey Hess 2013-11-20 19:16:42 -04:00
parent 64e1f738ad
commit e80d935b53
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Git/Repair.hs
View file

@ -523,11 +523,9 @@ runRepairOf fsckresult forced referencerepo g = do
Nothing Nothing
| forced -> ifM (pure (repoIsLocalBare g) <||> checkIndex S.empty g) | forced -> ifM (pure (repoIsLocalBare g) <||> checkIndex S.empty g)
( do ( do
fsckresult' <- findBroken False g missing' <- cleanCorruptObjects Nothing g
case fsckresult' of case missing' of
Nothing -> do Nothing -> return (False, S.empty, [])
putStrLn "Unable to fully recover; cannot find missing objects."
return (False, S.empty, [])
Just stillmissing' -> continuerepairs stillmissing' Just stillmissing' -> continuerepairs stillmissing'
, corruptedindex , corruptedindex
) )