diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-26 15:13:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-26 15:13:10 -0400 |
| commit | dce8bec196e978dfae4592f7308b750fcb97a609 (patch) | |
| tree | 3b58331b82c7c094e4ee341a5a31437eab3ed129 /Command | |
| parent | e3ef9d058af30419924bcd2169aea3716ce53105 (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 'Command')
| -rw-r--r-- | Command/Direct.hs | 2 | ||||
| -rw-r--r-- | Command/Indirect.hs | 2 | ||||
| -rw-r--r-- | Command/Upgrade.hs | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Command/Direct.hs b/Command/Direct.hs index 0c007bb10..d847a3270 100644 --- a/Command/Direct.hs +++ b/Command/Direct.hs @@ -14,6 +14,7 @@ import qualified Git.Command import qualified Git.LsFiles import Config import Annex.Direct +import Annex.Version def :: [Command] def = [notBareRepo $ @@ -53,4 +54,5 @@ cleanup :: CommandCleanup cleanup = do showStart "direct" "" setDirect True + setVersion directModeVersion return True diff --git a/Command/Indirect.hs b/Command/Indirect.hs index ac97be753..8bf228a80 100644 --- a/Command/Indirect.hs +++ b/Command/Indirect.hs @@ -17,6 +17,7 @@ import qualified Annex import Annex.Direct import Annex.Content import Annex.CatFile +import Annex.Version import Init def :: [Command] @@ -88,6 +89,7 @@ perform = do cleanup :: CommandCleanup cleanup = do + setVersion defaultVersion showStart "indirect" "" showEndOk return True diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs index b39fcd99c..d1c1eb3b0 100644 --- a/Command/Upgrade.hs +++ b/Command/Upgrade.hs @@ -23,5 +23,5 @@ start :: CommandStart start = do showStart "upgrade" "." r <- upgrade - setVersion + setVersion defaultVersion next $ next $ return r |