summaryrefslogtreecommitdiff
path: root/Upgrade
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 /Upgrade
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 'Upgrade')
-rw-r--r--Upgrade/V1.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index 966b51a44..72e105d16 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -53,14 +53,14 @@ upgrade = do
ifM (fromRepo Git.repoIsLocalBare)
( do
moveContent
- setVersion
+ setVersion defaultVersion
, do
moveContent
updateSymlinks
moveLocationLogs
Annex.Queue.flush
- setVersion
+ setVersion defaultVersion
)
Upgrade.V2.upgrade