This commit is contained in:
Joey Hess 2020-03-06 11:40:20 -04:00
parent eaa49ab53d
commit 2f204b5d37
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 17 additions and 7 deletions

View file

@ -35,13 +35,7 @@ replaceGitDirFile = replaceFile $ \dir -> do
{- replaceFile on a worktree file. -}
replaceWorkTreeFile :: FilePath -> (FilePath -> Annex a) -> Annex a
replaceWorkTreeFile = replaceFile $ \dir ->
fromRepo repoWorkTree >>= liftIO . \case
Just wt -> createDirectoryUnder (fromRawFilePath wt) dir
-- Should never happen, but let the file move be what
-- throws an exception as that would more clearly indicate
-- the problem.
Nothing -> noop
replaceWorkTreeFile = replaceFile createWorkTreeDirectory
{- Replaces a possibly already existing file with a new version,
- atomically, by running an action.