This commit is contained in:
Joey Hess 2010-10-16 22:59:19 -04:00
parent c0b16e0a73
commit 20b447782a

View file

@ -131,16 +131,16 @@ unannexCmd file = notinBackend file err $ \(key, backend) -> do
err = error $ "not annexed " ++ file err = error $ "not annexed " ++ file
moveout g src = do moveout g src = do
nocommit <- Annex.flagIsSet NoCommit nocommit <- Annex.flagIsSet NoCommit
liftIO removeFile file liftIO $ removeFile file
liftIO Git.run g ["rm", file] liftIO $ Git.run g ["rm", file]
if (not nocommit) if (not nocommit)
then liftIO Git.run g ["commit", "-m", then liftIO $ Git.run g ["commit", "-m",
("git-annex unannexed " ++ file), file] ("git-annex unannexed " ++ file), file]
else return () else return ()
-- git rm deletes empty directories; -- git rm deletes empty directories;
-- put them back -- put them back
liftIO createDirectoryIfMissing True (parentDir file) liftIO $ createDirectoryIfMissing True (parentDir file)
liftIO renameFile src file liftIO $ renameFile src file
return () return ()
{- Gets an annexed file from one of the backends. -} {- Gets an annexed file from one of the backends. -}