summaryrefslogtreecommitdiff
path: root/Annex/Direct.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-30 19:33:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-30 19:33:43 -0400
commit95f30f07830ddefc27a9cccb3dac97898e47e78b (patch)
tree4d184e49fc293446aa81d972a69575e7203d5476 /Annex/Direct.hs
parentde6a7a7ebbba3e8f517d038cf53949ab5bb7a575 (diff)
thaw content directory in direct mode too
A content directory can be frozen in direct mode. One way this can happen is if the content is transferred before direct mode has a mapping for it, so it's stored in the content directory. So, we need to thaw the content directory before doing things with it.
Diffstat (limited to 'Annex/Direct.hs')
-rw-r--r--Annex/Direct.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index 68da12a22..f8bdaebb3 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -25,6 +25,7 @@ import Annex.Content.Direct
import Annex.Link
import Utility.InodeCache
import Utility.CopyFile
+import Annex.Perms
{- Uses git ls-files to find files that need to be committed, and stages
- them into the index. Returns True if some changes were staged. -}
@@ -187,6 +188,7 @@ toDirectGen k f = do
[] -> ifM (liftIO $ doesFileExist loc)
( return $ Just $ do
{- Move content from annex to direct file. -}
+ thawContentDir loc
updateInodeCache k loc
thawContent loc
replaceFile f $ liftIO . moveFile loc