summaryrefslogtreecommitdiff
path: root/Types/GitConfig.hs
diff options
context:
space:
mode:
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 246c320d0..ff7cd3c90 100644
--- a/Types/GitConfig.hs
+++ b/Types/GitConfig.hs
@@ -122,8 +122,8 @@ extractRemoteGitConfig r remotename = RemoteGitConfig
getbool k def = fromMaybe def $ getmaybebool k
getmaybebool k = Git.Config.isTrue =<< getmaybe k
getmayberead k = readish =<< getmaybe k
- getmaybe k = maybe (Git.Config.getMaybe (key k) r) Just $
- Git.Config.getMaybe (remotekey k) r
+ getmaybe k = mplus (Git.Config.getMaybe (key k) r)
+ (Git.Config.getMaybe (remotekey k) r)
getoptions k = fromMaybe [] $ words <$> getmaybe k
key k = "annex." ++ k