From 6d9eb8da566c410c7780e15625dfed3f76a3e8f8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 6 Jan 2015 22:23:04 -0400 Subject: handle sync's use of setCurrentDirectory to work with relative paths I think this is the last problimatic setCurrentDirectory. I also audited for extrnal commands that git-annex might run with cwd = foo, and did not find any that were passed any FilePath that might be absolute. --- Annex.hs | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Annex.hs') diff --git a/Annex.hs b/Annex.hs index 202c25e4f..e4c05c627 100644 --- a/Annex.hs +++ b/Annex.hs @@ -31,6 +31,7 @@ module Annex ( changeGitRepo, getRemoteGitConfig, withCurrentState, + changeDirectory, ) where import Common @@ -300,3 +301,14 @@ withCurrentState :: Annex a -> Annex (IO a) withCurrentState a = do s <- getState id return $ eval s a + +{- It's not safe to use setCurrentDirectory in the Annex monad, + - because the git repo paths are stored relative. + - Instead, use this. + -} +changeDirectory :: FilePath -> Annex () +changeDirectory d = do + r <- liftIO . Git.adjustPath absPath =<< gitRepo + liftIO $ setCurrentDirectory d + r' <- liftIO $ Git.relPath r + changeState $ \s -> s { repo = r' } -- cgit v1.2.3