diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-14 15:35:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-14 15:35:15 -0400 |
| commit | 513b3a639796b06828570b6da6b049095abd5b83 (patch) | |
| tree | adc204e55854d1d5d4f75689ea17fa9624142872 /Types | |
| parent | cd4304b64943ba55ffc8beac47796affc5405fd8 (diff) | |
| parent | 1029cba6ac006b34053f3f96cbee9ecafe8cc1ae (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
debian/changelog
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/Difference.hs | 4 | ||||
| -rw-r--r-- | Types/Distribution.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Types/Difference.hs b/Types/Difference.hs index 74bac0aca..064703bf7 100644 --- a/Types/Difference.hs +++ b/Types/Difference.hs @@ -62,8 +62,8 @@ readDifferences :: String -> Differences readDifferences = maybe UnknownDifferences Differences . readish getDifferences :: Git.Repo -> Differences -getDifferences r = Differences $ S.fromList $ catMaybes $ - map getmaybe [minBound .. maxBound] +getDifferences r = Differences $ S.fromList $ + mapMaybe getmaybe [minBound .. maxBound] where getmaybe d = case Git.Config.isTrue =<< Git.Config.getMaybe (differenceConfigKey d) r of Just True -> Just d diff --git a/Types/Distribution.hs b/Types/Distribution.hs index 2a44a1575..d4de7a79b 100644 --- a/Types/Distribution.hs +++ b/Types/Distribution.hs @@ -25,7 +25,7 @@ type GitAnnexVersion = String data AutoUpgrade = AskUpgrade | AutoUpgrade | NoAutoUpgrade deriving (Eq) -toAutoUpgrade :: (Maybe String) -> AutoUpgrade +toAutoUpgrade :: Maybe String -> AutoUpgrade toAutoUpgrade Nothing = AskUpgrade toAutoUpgrade (Just s) | s == "ask" = AskUpgrade |