fix some build warnings from ghc 9.4.6
It now notices that a RepoLocation may not be Local, in which case pattern matching on Local wouldn't do.
This commit is contained in:
parent
a147a31baa
commit
ef7c867238
2 changed files with 6 additions and 3 deletions
|
@ -43,8 +43,10 @@ fixPostReceiveHookEnv = do
|
|||
case location g of
|
||||
Local { gitdir = ".", worktree = Just "." } ->
|
||||
Annex.adjustGitRepo $ \g' -> pure $ g'
|
||||
{ location = (location g')
|
||||
{ worktree = Just ".." }
|
||||
{ location = case location g' of
|
||||
loc@(Local {}) -> loc
|
||||
{ worktree = Just ".." }
|
||||
loc -> loc
|
||||
}
|
||||
_ -> noop
|
||||
|
||||
|
|
|
@ -175,7 +175,7 @@ updateLocation r@(Repo { location = l@(Local {}) }) = updateLocation' r l
|
|||
updateLocation r = return r
|
||||
|
||||
updateLocation' :: Repo -> RepoLocation -> IO Repo
|
||||
updateLocation' r l = do
|
||||
updateLocation' r l@(Local {}) = do
|
||||
l' <- case getMaybe "core.worktree" r of
|
||||
Nothing -> return l
|
||||
Just (ConfigValue d) -> do
|
||||
|
@ -185,6 +185,7 @@ updateLocation' r l = do
|
|||
return $ l { worktree = Just p }
|
||||
Just NoConfigValue -> return l
|
||||
return $ r { location = l' }
|
||||
updateLocation' r l = return r { location = l }
|
||||
|
||||
data ConfigStyle = ConfigList | ConfigNullList
|
||||
|
||||
|
|
Loading…
Reference in a new issue