more upgrades fixes for bare repos

This commit is contained in:
Joey Hess 2011-06-24 01:15:12 -04:00
parent 59b2e4ec1d
commit 49d77156ac

View file

@ -47,17 +47,20 @@ upgrade :: Annex Bool
upgrade = do upgrade = do
showNote "v2 to v3" showNote "v2 to v3"
g <- Annex.gitRepo g <- Annex.gitRepo
let bare = Git.repoIsLocalBare g
Branch.create Branch.create
mapM_ (\(k, f) -> inject f $ logFile k) =<< locationLogs g mapM_ (\(k, f) -> inject f $ logFile k) =<< locationLogs g
mapM_ (\f -> inject f f) =<< logFiles (olddir g) mapM_ (\f -> inject f f) =<< logFiles (olddir g)
liftIO $ do liftIO $ do
Git.run g "rm" [Param "-r", Param "-f", Param "-q", File (olddir g)] Git.run g "rm" [Param "-r", Param "-f", Param "-q", File (olddir g)]
unless (Git.repoIsLocalBare g) $ gitAttributesUnWrite g unless bare $ gitAttributesUnWrite g
showLongNote $ unless bare $ do
"git-annex branch created\n" ++ showLongNote $
"Now you should push the new branch: git push origin git-annex\n" "git-annex branch created\n" ++
showProgress "Now you should push the new branch: git push origin git-annex\n"
showProgress
return True return True