From a147a31baaf10b1328784b6485b2c4bb7805b326 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 21 Sep 2023 13:38:36 -0400 Subject: [PATCH] fix some build warnings from ghc 9.4.6 For some reason it doesn't notice that req must be a Req, because the toplevel function matched on that. --- Command/DiffDriver.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Command/DiffDriver.hs b/Command/DiffDriver.hs index 5bac213975..4c0e8b7fbc 100644 --- a/Command/DiffDriver.hs +++ b/Command/DiffDriver.hs @@ -106,9 +106,13 @@ parseReq opts fixupReq :: Req -> Options -> Annex Req fixupReq req@(UnmergedReq {}) _ = return req fixupReq req@(Req {}) opts = - check rOldFile rOldMode (\r f -> r { rOldFile = f }) req - >>= check rNewFile rNewMode (\r f -> r { rNewFile = f }) + check rOldFile rOldMode setoldfile req + >>= check rNewFile rNewMode setnewfile where + setoldfile r@(Req {}) f = r { rOldFile = f } + setoldfile r@(UnmergedReq {}) _ = r + setnewfile r@(Req {}) f = r { rNewFile = f } + setnewfile r@(UnmergedReq {}) _ = r check getfile getmode setfile r = case readTreeItemType (encodeBS (getmode r)) of Just TreeSymlink -> do v <- getAnnexLinkTarget' f False