diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 18:07:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 18:07:45 -0400 |
| commit | 944c51ba26efc39416c5f148b6ec36151dc7f42e (patch) | |
| tree | badbf7ca754618df5c2e045c4ac3aed12664b0d6 /Upgrade.hs | |
| parent | c7a1690f0247fefedc9b735bee1273660fc94e77 (diff) | |
improve version checking for v3
Do not set annex.version whenever any command is run. Just do it in init.
This ensures that, if a repo has annex.version=3, it has a git-annex
branch, so we don't have to run a command every time to check for the
branch.
Remove the old ad-hoc logic for v0 and v1, to simplify version checking.
Diffstat (limited to 'Upgrade.hs')
| -rw-r--r-- | Upgrade.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Upgrade.hs b/Upgrade.hs index 6cd75cf3e..a724ecce3 100644 --- a/Upgrade.hs +++ b/Upgrade.hs @@ -18,7 +18,7 @@ upgrade :: Annex Bool upgrade = do version <- getVersion case version of - "0" -> Upgrade.V0.upgrade - "1" -> Upgrade.V1.upgrade - "2" -> Upgrade.V2.upgrade + Just "0" -> Upgrade.V0.upgrade + Just "1" -> Upgrade.V1.upgrade + Just "2" -> Upgrade.V2.upgrade _ -> return True |