From 49ac40c1e90a2a32a2728e36f02a0f3baa854c8b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 May 2016 14:40:53 -0400 Subject: unify handling of unusual GIT_INDEX_FILE relative path This is probably a git bug that stuck in its interface. --- Annex/GitOverlay.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Annex/GitOverlay.hs') diff --git a/Annex/GitOverlay.hs b/Annex/GitOverlay.hs index 4796898b9..2eae5e7fe 100644 --- a/Annex/GitOverlay.hs +++ b/Annex/GitOverlay.hs @@ -19,10 +19,9 @@ import qualified Annex {- Runs an action using a different git index file. -} withIndexFile :: FilePath -> Annex a -> Annex a withIndexFile f a = do - -- Workaround http://thread.gmane.org/gmane.comp.version-control.git/294880 - absf <- liftIO $ absPath f + f' <- inRepo $ indexEnvVal f withAltRepo - (\g -> addGitEnv g indexEnv absf) + (\g -> addGitEnv g indexEnv f') (\g g' -> g' { gitEnv = gitEnv g }) a -- cgit v1.2.3