From e2b93987143faba2c1f507da436752ef826c5ff3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 May 2016 13:29:51 -0400 Subject: Work around git bug in handling of relative path to GIT_INDEX_FILE when in a subdirectory of the repository. This affected git annex view. It turns out that some other places that use GIT_INDEX_FILE were already working around the bug. I removed the workaround from Annex.Branch since the new workaround will do. --- Annex/GitOverlay.hs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Annex/GitOverlay.hs') diff --git a/Annex/GitOverlay.hs b/Annex/GitOverlay.hs index e33d8a83c..8cc1e04d1 100644 --- a/Annex/GitOverlay.hs +++ b/Annex/GitOverlay.hs @@ -17,9 +17,13 @@ import qualified Annex {- Runs an action using a different git index file. -} withIndexFile :: FilePath -> Annex a -> Annex a -withIndexFile f = withAltRepo - (\g -> addGitEnv g "GIT_INDEX_FILE" f) - (\g g' -> g' { gitEnv = gitEnv g }) +withIndexFile f a = do + -- Workaround http://thread.gmane.org/gmane.comp.version-control.git/294880 + absf <- liftIO $ absPath f + withAltRepo + (\g -> addGitEnv g "GIT_INDEX_FILE" absf) + (\g g' -> g' { gitEnv = gitEnv g }) + a {- Runs an action using a different git work tree. - -- cgit v1.2.3