From: Joey Hess Date: Mon, 14 Dec 2020 21:48:30 +0000 (-0400) Subject: improve readability and fix a warning X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~2^2^2~76^2~343 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9de5506f194b51c6ed9eb9061ec5d09dee1142fa;p=git-annex.git improve readability and fix a warning --- diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs index e2128f2ee1..bcde9ba4a8 100644 --- a/Annex/FileMatcher.hs +++ b/Annex/FileMatcher.hs @@ -72,10 +72,11 @@ checkMatcher :: FileMatcher Annex -> Maybe Key -> AssociatedFile -> AssumeNotPre checkMatcher matcher mkey afile notpresent notconfigured d | isEmpty matcher = notconfigured | otherwise = case (mkey, afile) of - (mkey, AssociatedFile (Just file)) -> + (_, AssociatedFile (Just file)) -> go =<< fileMatchInfo file mkey - (Just key, _) -> go (MatchingKey key afile) - _ -> d + (Just key, AssociatedFile Nothing) -> + go (MatchingKey key afile) + (Nothing, _) -> d where go mi = checkMatcher' matcher mi notpresent