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. --- Git/Index.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Git') diff --git a/Git/Index.hs b/Git/Index.hs index 551fd98d3..a8b1df396 100644 --- a/Git/Index.hs +++ b/Git/Index.hs @@ -24,7 +24,9 @@ indexEnv = "GIT_INDEX_FILE" override :: FilePath -> IO (IO ()) override index = do res <- getEnv var - setEnv var index True + -- Workaround http://thread.gmane.org/gmane.comp.version-control.git/294880 + absindex <- absPath index + setEnv var absindex True return $ reset res where var = "GIT_INDEX_FILE" -- cgit v1.2.3