summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-02-26 15:13:10 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-02-26 15:13:10 -0400
commitdce8bec196e978dfae4592f7308b750fcb97a609 (patch)
tree3b58331b82c7c094e4ee341a5a31437eab3ed129 /Annex
parente3ef9d058af30419924bcd2169aea3716ce53105 (diff)
annex.version is now set to 4 for direct mode repositories
To avoid old versions of git-annex getting confused. There is no upgrade required though. We switch back to 3 when going from direct to indirect.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Version.hs11
1 files changed, 7 insertions, 4 deletions
diff --git a/Annex/Version.hs b/Annex/Version.hs
index 6149e6fb7..31c6501be 100644
--- a/Annex/Version.hs
+++ b/Annex/Version.hs
@@ -1,6 +1,6 @@
{- git-annex repository versioning
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2013 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
@@ -16,8 +16,11 @@ type Version = String
defaultVersion :: Version
defaultVersion = "3"
+directModeVersion :: Version
+directModeVersion = "4"
+
supportedVersions :: [Version]
-supportedVersions = [defaultVersion]
+supportedVersions = [defaultVersion, directModeVersion]
upgradableVersions :: [Version]
upgradableVersions = ["0", "1", "2"]
@@ -28,8 +31,8 @@ versionField = annexConfig "version"
getVersion :: Annex (Maybe Version)
getVersion = annexVersion <$> Annex.getGitConfig
-setVersion :: Annex ()
-setVersion = setConfig versionField defaultVersion
+setVersion :: Version -> Annex ()
+setVersion = setConfig versionField
removeVersion :: Annex ()
removeVersion = unsetConfig versionField