merge from git-repair

This commit is contained in:
Joey Hess 2013-11-20 19:16:42 -04:00
parent 64e1f738ad
commit e80d935b53

View file

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