mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

repair: better messages when nuking .git/annex/index

Browse source
This commit is contained in:
Joey Hess 2014-01-13 16:47:18 -04:00
parent 133968a549
commit a05aa19ea8
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Command/Repair.hs
View file

@ -12,6 +12,7 @@ import Command
import qualified Annex import qualified Annex
import qualified Git.Repair import qualified Git.Repair
import qualified Annex.Branch import qualified Annex.Branch
import qualified Git.Ref
import Git.Types import Git.Types
import Annex.Version import Annex.Version
@ -55,18 +56,26 @@ repairAnnexBranch modifiedbranches
( commitindex ( commitindex
, do , do
nukeindex nukeindex
liftIO $ putStrLn "Had to delete the .git/annex/index file as it was corrupt. Since the git-annex branch is not up-to-date anymore. It would be a very good idea to run: git annex fsck --fast" missingbranch
) )
| otherwise = ifM okindex | otherwise = ifM okindex
( noop ( noop
, nukeindex , do
nukeindex
ifM (null <$> inRepo (Git.Ref.matching [Annex.Branch.fullname]))
( missingbranch
, liftIO $ putStrLn "No data was lost."
)
) )
where where
okindex = Annex.Branch.withIndex $ inRepo $ Git.Repair.checkIndex okindex = Annex.Branch.withIndex $ inRepo $ Git.Repair.checkIndex
commitindex = do commitindex = do
Annex.Branch.forceCommit "committing index after git repository repair" Annex.Branch.forceCommit "committing index after git repository repair"
liftIO $ putStrLn "Successfully recovered the git-annex branch using .git/annex/index" liftIO $ putStrLn "Successfully recovered the git-annex branch using .git/annex/index"
nukeindex = inRepo $ nukeFile . gitAnnexIndex nukeindex = do
inRepo $ nukeFile . gitAnnexIndex
liftIO $ putStrLn "Had to delete the .git/annex/index file as it was corrupt."
missingbranch = liftIO $ putStrLn "Since the git-annex branch is not up-to-date anymore. It would be a very good idea to run: git annex fsck --fast"
trackingOrSyncBranch :: Ref -> Bool trackingOrSyncBranch :: Ref -> Bool
trackingOrSyncBranch b = Git.Repair.isTrackingBranch b || isAnnexSyncBranch b trackingOrSyncBranch b = Git.Repair.isTrackingBranch b || isAnnexSyncBranch b