diff options
| author |  Richard Hartmann <richih@debian.org> | 2014-01-21 00:58:15 +0100 |
|---|---|---|
| committer | Richard Hartmann <richih@debian.org> | 2014-01-21 00:58:15 +0100 |
| commit | 3b5008704fe9f369c40b172aefb69f956e140bec (patch) | |
| tree | 83c8c8514e9afdba7a06a2306f7c81b2bd932a10 /Types/GitConfig.hs | |
| parent | 5025588ab071106ce9563f93a9aea3fb2d032d91 (diff) | |
| parent | 4140cd6b4d6c0adb899262ca7843589a8b1b2433 (diff) | |
Merge branch 'master' of git://git-annex.branchable.com
Diffstat (limited to 'Types/GitConfig.hs')
| -rw-r--r-- | Types/GitConfig.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index cda53f229..5cd09dbde 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -24,7 +24,7 @@ import Types.Availability - such as annex.foo -} data GitConfig = GitConfig { annexVersion :: Maybe String - , annexNumCopies :: Int + , annexNumCopies :: Maybe Int , annexDiskReserve :: Integer , annexDirect :: Bool , annexBackends :: [String] @@ -52,7 +52,7 @@ data GitConfig = GitConfig extractGitConfig :: Git.Repo -> GitConfig extractGitConfig r = GitConfig { annexVersion = notempty $ getmaybe (annex "version") - , annexNumCopies = get (annex "numcopies") 1 + , annexNumCopies = getmayberead (annex "numcopies") , annexDiskReserve = fromMaybe onemegabyte $ readSize dataUnits =<< getmaybe (annex "diskreserve") , annexDirect = getbool (annex "direct") False |