diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-10-05 16:23:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-10-05 16:23:09 -0400 |
| commit | aa38d92afcc0efbe7bb9786d00c45f71af756b75 (patch) | |
| tree | 8d41e4a52905d1a6141e2761aeaa5b93ffd36d71 /Upgrade | |
| parent | 1497590d45d8f7bebc8b308e7196e493c0489f60 (diff) | |
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
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 6 |
1 files changed, 1 insertions, 5 deletions
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 |