diff options
author | Joey Hess <joey@kitenet.net> | 2013-11-30 14:29:11 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-11-30 14:29:11 -0400 |
commit | f04b34c4584e18f4c722700eda5e80eb0345f035 (patch) | |
tree | 1c224b92daedc732fa7cd3970603874e8c1fafbe /Assistant/Threads | |
parent | 9c6587636ef68bd1551f65069118332c337dec48 (diff) |
merge improved fsck types from git-repair and some associated changes
Diffstat (limited to 'Assistant/Threads')
-rw-r--r-- | Assistant/Threads/SanityChecker.hs | 3 |
1 files changed, 2 insertions, 1 deletions
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. -} |