aboutsummaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-17 13:29:51 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-17 13:29:51 -0400
commite2b93987143faba2c1f507da436752ef826c5ff3 (patch)
treea23a6d48f619686854926b809f2d64dcc7683819 /Git
parent4efa70598eda24fddf8c3f4bbd86fc96576a5bf1 (diff)
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.
Diffstat (limited to 'Git')
-rw-r--r--Git/Index.hs4
1 files changed, 3 insertions, 1 deletions
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"