summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-20 19:16:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-20 19:16:42 -0400
commit7cd2822e1264e22649132ab824d02714f5e5e882 (patch)
tree29897aee4b6c155d7944014c13a17ebcd638d667 /Git
parent1c584fc0707347c3a4b2a467b191ecec8dc030f0 (diff)
merge from git-repair
Diffstat (limited to 'Git')
-rw-r--r--Git/Repair.hs8
1 files changed, 3 insertions, 5 deletions
diff --git a/Git/Repair.hs b/Git/Repair.hs
index afbb87d8c..2578f2c17 100644
--- a/Git/Repair.hs
+++ b/Git/Repair.hs
@@ -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
)