This commit is contained in:
Joey Hess 2011-11-11 01:52:58 -04:00
parent b327227ba5
commit 637b5feb45
26 changed files with 71 additions and 102 deletions

View file

@ -51,7 +51,7 @@ upgrade :: Annex Bool
upgrade = do
showAction "v1 to v2"
bare <- fromRepo $ Git.repoIsLocalBare
bare <- fromRepo Git.repoIsLocalBare
if bare
then do
moveContent
@ -113,7 +113,7 @@ moveLocationLogs = do
else return []
move (l, k) = do
dest <- fromRepo $ logFile2 k
dir <- fromRepo $ Upgrade.V2.gitStateDir
dir <- fromRepo Upgrade.V2.gitStateDir
let f = dir </> l
liftIO $ createDirectoryIfMissing True (parentDir dest)
-- could just git mv, but this way deals with