From aa38d92afcc0efbe7bb9786d00c45f71af756b75 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 5 Oct 2016 16:23:09 -0400 Subject: When auto-upgrading a v3 remote, avoid upgrading to version 6, instead keep it at version 5. Fixes a bug introduced with v6 mode that I didn't notice until now. Probably not many v3 repos left out there, and upgrading them to v6 mode is not disastrous, only a little premature. This commit was sponsored by Riku Voipio --- Upgrade/V1.hs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Upgrade') diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index 90e1a62a0..c82cf92f5 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -19,7 +19,6 @@ import qualified Annex.Queue import qualified Git import qualified Git.LsFiles as LsFiles import Backend -import Annex.Version import Utility.FileMode import Utility.Tmp import qualified Upgrade.V2 @@ -52,16 +51,13 @@ upgrade = do showAction "v1 to v2" ifM (fromRepo Git.repoIsLocalBare) - ( do - moveContent - setVersion latestVersion + ( moveContent , do moveContent updateSymlinks moveLocationLogs Annex.Queue.flush - setVersion latestVersion ) Upgrade.V2.upgrade -- cgit v1.2.3