aboutsummaryrefslogtreecommitdiff
path: root/Types/GitConfig.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-28 16:11:28 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-28 16:11:28 -0400
commit82161654830b0dc4187e9928555c9321ef61bb89 (patch)
treefef3edba1366663956ed484a9c9951616765d505 /Types/GitConfig.hs
parent7ca8ec00a7fcda71a08d22f06838424765a1b215 (diff)
import Data.Default in Common
Diffstat (limited to 'Types/GitConfig.hs')
-rw-r--r--Types/GitConfig.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs
index 5ac524f45..ef8f2f2bd 100644
--- a/Types/GitConfig.hs
+++ b/Types/GitConfig.hs
@@ -98,7 +98,7 @@ extractGitConfig r = GitConfig
, annexDifferences = getDifferences r
}
where
- getbool k def = fromMaybe def $ getmaybebool k
+ getbool k d = fromMaybe d $ getmaybebool k
getmaybebool k = Git.Config.isTrue =<< getmaybe k
getmayberead k = readish =<< getmaybe k
getmaybe k = Git.Config.getMaybe k r
@@ -178,7 +178,7 @@ extractRemoteGitConfig r remotename = RemoteGitConfig
, remoteGitConfig = Nothing
}
where
- getbool k def = fromMaybe def $ getmaybebool k
+ getbool k d = fromMaybe d $ getmaybebool k
getmaybebool k = Git.Config.isTrue =<< getmaybe k
getmayberead k = readish =<< getmaybe k
getmaybe k = mplus (Git.Config.getMaybe (key k) r)