diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-03 03:52:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-03 03:52:41 -0400 |
| commit | 6543d5406c64bb00a58e74305ec9ca09a49faf0b (patch) | |
| tree | 5e33ceb3ea5b5bf5ad4f2cbb7d08b19cb1026897 /Types/GitConfig.hs | |
| parent | f0dd3c6c1624cb5441eab175c6f5a683d3806885 (diff) | |
hlint
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 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 |