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

do tmp dir cleanup in error case too

Browse source
This commit is contained in:
Joey Hess 2015-10-15 14:27:14 -04:00
parent 1b023493ef
commit 3879f6e6be
Failed to extract signature
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Annex/Direct.hs
View file

@ -182,8 +182,9 @@ mergeDirect startbranch oldref branch resolvemerge commitmode = exclusively $ do
mergeDirectCommit merged startbranch branch commitmode mergeDirectCommit merged startbranch branch commitmode
liftIO $ whenM (doesFileExist tmpi) $ liftIO $ whenM (doesFileExist tmpi) $
rename tmpi reali rename tmpi reali
else liftIO $ nukeFile tmpi else do
liftIO $ nukeFile tmpi
liftIO $ removeDirectoryRecursive d
return ok return ok
where where
exclusively = withExclusiveLock gitAnnexMergeLock exclusively = withExclusiveLock gitAnnexMergeLock
@ -233,9 +234,7 @@ mergeDirectCommit allowff old branch commitmode = do
canff = maybe (return False) (\o -> inRepo $ Git.Branch.fastForwardable o branch) old canff = maybe (return False) (\o -> inRepo $ Git.Branch.fastForwardable o branch) old
mergeDirectCleanup :: FilePath -> Git.Ref -> Annex () mergeDirectCleanup :: FilePath -> Git.Ref -> Annex ()
mergeDirectCleanup d oldref = do mergeDirectCleanup d oldref = updateWorkTree d oldref False
updateWorkTree d oldref False
liftIO $ removeDirectoryRecursive d
{- Updates the direct mode work tree to reflect the changes staged in the {- Updates the direct mode work tree to reflect the changes staged in the
- index by a git command, that was run in a temporary work tree. - index by a git command, that was run in a temporary work tree.