From f04b34c4584e18f4c722700eda5e80eb0345f035 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Nov 2013 14:29:11 -0400 Subject: merge improved fsck types from git-repair and some associated changes --- Assistant/Threads/SanityChecker.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Assistant/Threads/SanityChecker.hs') diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs index 6946e8b3a..f417606b5 100644 --- a/Assistant/Threads/SanityChecker.hs +++ b/Assistant/Threads/SanityChecker.hs @@ -26,6 +26,7 @@ import Utility.NotificationBroadcaster import Config import Utility.HumanTime import Git.Repair +import Git.Index import Data.Time.Clock.POSIX import qualified Data.Set as S @@ -43,7 +44,7 @@ sanityCheckerStartupThread startupdelay = namedThreadUnchecked "SanityCheckerSta ifM (not <$> liftAnnex (inRepo (checkIndex S.empty))) ( do notice ["corrupt index file found at startup; removing and restaging"] - liftAnnex $ inRepo nukeIndex + liftAnnex $ inRepo $ nukeFile . indexFile {- Normally the startup scan avoids re-staging files, - but with the index deleted, everything needs to be - restaged. -} -- cgit v1.2.3