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

use replaceWorkTreeFile when fixing an annex symlink

Browse source 
This does not change any behavior, but it's useful for all worktree
changes to be made using this.

Sponsored-by: Graham Spencer on Patreon
This commit is contained in:
Joey Hess 2022-06-22 13:40:14 -04:00
parent cfc65ee9fc
commit af1a45c69c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Command/Fix.hs
View file

@ -97,11 +97,11 @@ fixSymlink file link = do
mtime <- liftIO $ catchMaybeIO $ Posix.modificationTimeHiRes mtime <- liftIO $ catchMaybeIO $ Posix.modificationTimeHiRes
<$> R.getSymbolicLinkStatus file <$> R.getSymbolicLinkStatus file
#endif #endif
createWorkTreeDirectory (parentDir file) replaceWorkTreeFile (fromRawFilePath file) $ \tmpfile -> do
liftIO $ R.removeLink file let tmpfile' = toRawFilePath tmpfile
liftIO $ R.createSymbolicLink link file liftIO $ R.createSymbolicLink link tmpfile'
#if ! defined(mingw32_HOST_OS) #if ! defined(mingw32_HOST_OS)
liftIO $ maybe noop (\t -> touch file t False) mtime liftIO $ maybe noop (\t -> touch tmpfile' t False) mtime
#endif #endif
stageSymlink file =<< hashSymlink link stageSymlink file =<< hashSymlink link
next $ return True next $ return True

5
doc/bugs/worktree_overwrite_races.mdwn
View file

@ -4,9 +4,8 @@ file, and then they call that to replace it with something else. But in
between, the file could be overwritten with other content. And that content between, the file could be overwritten with other content. And that content
then gets replaced, which is not expected behavior. then gets replaced, which is not expected behavior.
Some other commands may modify the worktree without using it (oops) (Some other commands may modify the worktree without using it (oops)
and also be susceptable to a race. `git-annex fix` in fixSymlink, for example, and also be susceptable to a race?)
checks if the file is a symlink, and then deletes and recreates it.
[[!commit 5ef79125ad0eddd5467b6bec451fdcdbd748b96f]] fixed one of these [[!commit 5ef79125ad0eddd5467b6bec451fdcdbd748b96f]] fixed one of these
races, but not in an ideal way. races, but not in an ideal way.