diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-05 16:42:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-05 17:05:03 -0400 |
| commit | 4f6c8222072ace33e3acedddd31637089ae474b6 (patch) | |
| tree | 720d851820dd6ccc51e5393f2dc87818141ec2ed /Command | |
| parent | da9eea5dc0e86b4abb14064346eddc5689d94333 (diff) | |
v5 for direct mode, with automatic upgrade
This includes storing the current state of the HEAD ref, which git annex
sync is going to need, but does not make sync use it.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Upgrade.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs index 88ca8622d..66ea0e0eb 100644 --- a/Command/Upgrade.hs +++ b/Command/Upgrade.hs @@ -11,6 +11,7 @@ import Common.Annex import Command import Upgrade import Annex.Version +import Config def :: [Command] def = [dontCheck repoExists $ -- because an old version may not seem to exist @@ -23,6 +24,9 @@ seek = [withNothing start] start :: CommandStart start = do showStart "upgrade" "." - r <- upgrade - setVersion defaultVersion + r <- upgrade False + ifM isDirect + ( setVersion directModeVersion + , setVersion defaultVersion + ) next $ next $ return r |