From a696b98024d8b9009cd6ad021f20e087607145f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 29 Dec 2013 13:06:23 -0400
Subject: Auto-upgrade v3 indirect repos to v5 with no changes. This also fixes
 a problem when a direct mode repo was somehow set to v3 rather than v4, and
 so the automatic direct mode upgrade to v5 was not done.

---
 Command/Direct.hs   | 2 --
 Command/Indirect.hs | 2 --
 Command/Version.hs  | 4 +---
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'Command')

diff --git a/Command/Direct.hs b/Command/Direct.hs
index 1f262bd9f..c35bbdaea 100644
--- a/Command/Direct.hs
+++ b/Command/Direct.hs
@@ -16,7 +16,6 @@ import qualified Git.Command
 import qualified Git.LsFiles
 import Config
 import Annex.Direct
-import Annex.Version
 import Annex.Exception
 
 def :: [Command]
@@ -69,5 +68,4 @@ cleanup :: CommandCleanup
 cleanup = do
 	showStart "direct" ""
 	setDirect True
-	setVersion directModeVersion
 	return True
diff --git a/Command/Indirect.hs b/Command/Indirect.hs
index 8b857e2f6..a8669fe50 100644
--- a/Command/Indirect.hs
+++ b/Command/Indirect.hs
@@ -22,7 +22,6 @@ import Annex.Direct
 import Annex.Content
 import Annex.Content.Direct
 import Annex.CatFile
-import Annex.Version
 import Annex.Exception
 import Init
 import qualified Command.Add
@@ -107,7 +106,6 @@ perform = do
 	
 cleanup :: CommandCleanup
 cleanup = do
-	setVersion defaultVersion
 	showStart "indirect" ""
 	showEndOk
 	return True
diff --git a/Command/Version.hs b/Command/Version.hs
index 13b839e66..0326b9ede 100644
--- a/Command/Version.hs
+++ b/Command/Version.hs
@@ -30,9 +30,7 @@ start = do
 	liftIO $ do
 		showPackageVersion
 		info "local repository version" $ fromMaybe "unknown" v
-		info "default repository version" defaultVersion
-		info "supported repository versions" $
-			unwords supportedVersions
+		info "supported repository version" supportedVersion
 		info "upgrade supported from repository versions" $
 			unwords upgradableVersions
 	stop
-- 
cgit v1.2.3