summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-07 16:04:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-07 16:04:03 -0400
commit7793828a844b1c5e91ea61d6beef8c1d8aaf7379 (patch)
tree38a38b5332214aa5074da4f1eedf026f9f558afc
parent5aa000523befd1dee93d86f5784c05a856e807d3 (diff)
uninit: Unset annex.version. Closes: #689852
-rw-r--r--Annex/Version.hs3
-rw-r--r--Init.hs1
-rw-r--r--debian/changelog1
3 files changed, 5 insertions, 0 deletions
diff --git a/Annex/Version.hs b/Annex/Version.hs
index 7c909ae05..00e574929 100644
--- a/Annex/Version.hs
+++ b/Annex/Version.hs
@@ -33,6 +33,9 @@ getVersion = handle <$> getConfig versionField ""
setVersion :: Annex ()
setVersion = setConfig versionField defaultVersion
+removeVersion :: Annex ()
+removeVersion = unsetConfig versionField
+
checkVersion :: Version -> Annex ()
checkVersion v
| v `elem` supportedVersions = noop
diff --git a/Init.hs b/Init.hs
index ec85b7fe0..aae10160d 100644
--- a/Init.hs
+++ b/Init.hs
@@ -48,6 +48,7 @@ uninitialize :: Annex ()
uninitialize = do
gitPreCommitHookUnWrite
removeRepoUUID
+ removeVersion
{- Will automatically initialize if there is already a git-annex
branch from somewhere. Otherwise, require a manual init
diff --git a/debian/changelog b/debian/changelog
index 560447e10..f612238aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ git-annex (3.20121002) UNRELEASED; urgency=low
of the repository configuration settings stored in the git-annex branch.
* Only build-depend on libghc-clientsession-dev on arches that will have
the webapp.
+ * uninit: Unset annex.version. Closes: #689852
-- Joey Hess <joeyh@debian.org> Mon, 01 Oct 2012 15:09:49 -0400