From b9186e3c2097cf8c94403b38c9dbe6ed382d82b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 22 Oct 2013 14:39:45 -0400 Subject: make git fsck batch-capable --- git-recover-repository.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'git-recover-repository.hs') diff --git a/git-recover-repository.hs b/git-recover-repository.hs index 11a0b3a1c..d2249a433 100644 --- a/git-recover-repository.hs +++ b/git-recover-repository.hs @@ -1,6 +1,6 @@ {- git-recover-repository program - - - Copyright 2012 Joey Hess + - Copyright 2013 Joey Hess - - Licensed under the GNU GPL version 3 or higher. -} @@ -15,6 +15,7 @@ import qualified Data.Set as S import Common import qualified Git import qualified Git.CurrentRepo +import qualified Git.Fsck import qualified Git.RecoverRepository import qualified Git.Config import qualified Git.Branch @@ -46,7 +47,9 @@ main = do forced <- parseArgs g <- Git.Config.read =<< Git.CurrentRepo.get - missing <- Git.RecoverRepository.cleanCorruptObjects g + putStrLn "Running git fsck ..." + fsckresult <- Git.Fsck.findBroken False g + missing <- Git.RecoverRepository.cleanCorruptObjects fsckresult g stillmissing <- Git.RecoverRepository.retrieveMissingObjects missing g if S.null stillmissing then putStr $ unlines -- cgit v1.2.3