projects
/
git-annex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5c418b
)
RawFilePath optimisation
author
Joey Hess
<joeyh@joeyh.name>
Wed, 22 Jun 2022 20:08:26 +0000
(16:08 -0400)
committer
Joey Hess
<joeyh@joeyh.name>
Wed, 22 Jun 2022 20:08:26 +0000
(16:08 -0400)
Annex/Content.hs
patch
|
blob
|
history
diff --git
a/Annex/Content.hs
b/Annex/Content.hs
index c054d459511acaa8d85de2f147a49fa13471c84e..6e31ef0ea5b8bb7c006cec929d8d34fb8ea341b1 100644
(file)
--- a/
Annex/Content.hs
+++ b/
Annex/Content.hs
@@
-641,7
+641,7
@@
removeAnnex (ContentRemovalLock key) = withObjectLoc key $ \file ->
where
-- Check associated pointer file for modifications, and reset if
-- it's unmodified.
- resetpointer file = unlessM (liftIO $ isSymbolicLink <$>
getSymbolicLinkStatus (fromRawFilePath file)
) $
+ resetpointer file = unlessM (liftIO $ isSymbolicLink <$>
R.getSymbolicLinkStatus file
) $
ifM (isUnmodified key file)
( adjustedBranchRefresh (AssociatedFile (Just file)) $
depopulatePointerFile key file