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

convert replaceFile to createDirectoryUnder

Browse source 
Since it was used on both worktree and .git/annex files, split into
multiple functions.

In passing, this also improves permissions of created directories in
.git/annex, using createAnnexDirectory on those.
This commit is contained in:
Joey Hess 2020-03-06 11:31:01 -04:00
parent b6c14a84ab
commit eaa49ab53d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
12 changed files with 53 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Annex/AutoMerge.hs
View file

@ -208,7 +208,7 @@ resolveMerge' unstagedmap (Just us) them inoverlay u = do
stageSymlink dest' =<< hashSymlink l
replacewithsymlink dest link = withworktree dest $ \f ->
replaceFile f $ makeGitLink link . toRawFilePath
replaceWorkTreeFile f $ makeGitLink link . toRawFilePath
makepointer key dest destmode = do
unless inoverlay $
@ -256,7 +256,7 @@ resolveMerge' unstagedmap (Just us) them inoverlay u = do
, case selectwant' (LsFiles.unmergedSha u) of
Nothing -> noop
Just sha -> withworktree item $ \f ->
replaceFile f $ \tmp -> do
replaceWorkTreeFile f $ \tmp -> do
c <- catObject sha
liftIO $ L.writeFile tmp c
)