summaryrefslogtreecommitdiff
path: root/Annex/GitOverlay.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-17 14:40:53 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-17 14:42:06 -0400
commit49ac40c1e90a2a32a2728e36f02a0f3baa854c8b (patch)
treed094e3d761dd06b065c94f9265bc99afcce23dcc /Annex/GitOverlay.hs
parent323e3665c2526c6560f71efb013543dd068eb612 (diff)
unify handling of unusual GIT_INDEX_FILE relative path
This is probably a git bug that stuck in its interface.
Diffstat (limited to 'Annex/GitOverlay.hs')
-rw-r--r--Annex/GitOverlay.hs5
1 files changed, 2 insertions, 3 deletions
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