Annexed file contents are now made unwritable and put in unwriteable directories, to avoid them accidentially being removed or modified. (Thanks Josh Triplett for the idea.)

1 files changed, 2 insertions, 7 deletions

diff --git a/Command/Add.hs b/Command/Add.hs
index 3cc681f69..6c5d24f84 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -9,12 +9,9 @@ module Command.Add where
 
 import Control.Monad.State (liftIO)
 import System.Posix.Files
-import System.Directory
 
 import Command
 import qualified Annex
-import Utility
-import Locations
 import qualified Backend
 import LocationLog
 import Types
@@ -42,11 +39,9 @@ perform (file, backend) = do
 
 cleanup :: FilePath -> Key -> SubCmdCleanup
 cleanup file key = do
+	moveAnnex key file
 	logStatus key ValuePresent
-	g <- Annex.gitRepo
-	let dest = annexLocation g key
-	liftIO $ createDirectoryIfMissing True (parentDir dest)
-	liftIO $ renameFile file dest
+
 	link <- calcGitLink file key
 	liftIO $ createSymbolicLink link file
 	Annex.queue "add" [] file