From 8e953532e27d6dee001d5ef6c9230ac03c36c335 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 22 Jan 2014 23:10:51 -0400
Subject: allow annex.expireunused to be set to false, as well as to a duration

---
 Types/GitConfig.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Types')

diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs
index f8e3be98e..148d73b93 100644
--- a/Types/GitConfig.hs
+++ b/Types/GitConfig.hs
@@ -47,7 +47,7 @@ data GitConfig = GitConfig
 	, annexLargeFiles :: Maybe String
 	, annexFsckNudge :: Bool
 	, annexAutoUpgrade :: AutoUpgrade
-	, annexExpireUnused :: Maybe Duration
+	, annexExpireUnused :: Maybe (Maybe Duration)
 	, coreSymlinks :: Bool
 	, gcryptId :: Maybe String
 	}
@@ -77,7 +77,8 @@ extractGitConfig r = GitConfig
 	, annexLargeFiles = getmaybe (annex "largefiles")
 	, annexFsckNudge = getbool (annex "fscknudge") True
 	, annexAutoUpgrade = toAutoUpgrade $ getmaybe (annex "autoupgrade")
-	, annexExpireUnused = parseDuration =<< getmaybe (annex "expireunused")
+	, annexExpireUnused = maybe Nothing Just . parseDuration
+		<$> getmaybe (annex "expireunused")
 	, coreSymlinks = getbool "core.symlinks" True
 	, gcryptId = getmaybe "core.gcrypt-id"
 	}
-- 
cgit v1.2.3