summaryrefslogtreecommitdiff
path: root/test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-13 12:52:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-13 12:52:09 -0400
commit1ae780ee7990dc542a61714522c902754e76fb05 (patch)
tree1adfc326dc9110dcf7421304980103b981a6701d /test.hs
parentdaff9029ba85cee772b707add61e8ce1d7fd953f (diff)
git-annex, git-union-merge: Support GIT_DIR and GIT_WORK_TREE.
Note that GIT_WORK_TREE cannot influence GIT_DIR; that is necessary for git-fake-bare and vcsh type things to work.
Diffstat (limited to 'test.hs')
-rw-r--r--test.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test.hs b/test.hs
index ee88c5f08..3aef83e87 100644
--- a/test.hs
+++ b/test.hs
@@ -727,7 +727,7 @@ git_annex_expectoutput command params expected = do
-- are not run; this should only be used for actions that query state.
annexeval :: Types.Annex a -> IO a
annexeval a = do
- g <- Git.Construct.fromCwd
+ g <- Git.Construct.fromCurrent
g' <- Git.Config.read g
s <- Annex.new g'
Annex.eval s { Annex.output = Annex.QuietOutput } a