mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix some build warnings from ghc 9.4.6

Browse source 
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:
Joey Hess 2023-09-21 13:40:22 -04:00
parent a147a31baa
commit ef7c867238
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Command/PostReceive.hs
View file

@ -43,8 +43,10 @@ fixPostReceiveHookEnv = do
case location g of case location g of
Local { gitdir = ".", worktree = Just "." } -> Local { gitdir = ".", worktree = Just "." } ->
Annex.adjustGitRepo $ \g' -> pure $ g' Annex.adjustGitRepo $ \g' -> pure $ g'
{ location = (location g') { location = case location g' of
{ worktree = Just ".." } loc@(Local {}) -> loc
{ worktree = Just ".." }
loc -> loc
} }
_ -> noop _ -> noop

3
Git/Config.hs
View file

@ -175,7 +175,7 @@ updateLocation r@(Repo { location = l@(Local {}) }) = updateLocation' r l
updateLocation r = return r updateLocation r = return r
updateLocation' :: Repo -> RepoLocation -> IO Repo updateLocation' :: Repo -> RepoLocation -> IO Repo
updateLocation' r l = do updateLocation' r l@(Local {}) = do
l' <- case getMaybe "core.worktree" r of l' <- case getMaybe "core.worktree" r of
Nothing -> return l Nothing -> return l
Just (ConfigValue d) -> do Just (ConfigValue d) -> do
@ -185,6 +185,7 @@ updateLocation' r l = do
return $ l { worktree = Just p } return $ l { worktree = Just p }
Just NoConfigValue -> return l Just NoConfigValue -> return l
return $ r { location = l' } return $ r { location = l' }
updateLocation' r l = return r { location = l }
data ConfigStyle = ConfigList | ConfigNullList data ConfigStyle = ConfigList | ConfigNullList