From 1ae780ee7990dc542a61714522c902754e76fb05 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Jan 2012 12:52:09 -0400 Subject: 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. --- git-union-merge.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-union-merge.hs') diff --git a/git-union-merge.hs b/git-union-merge.hs index e439c4665..f44136bfc 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -40,7 +40,7 @@ parseArgs = do main :: IO () main = do [aref, bref, newref] <- map Git.Ref <$> parseArgs - g <- Git.Config.read =<< Git.Construct.fromCwd + g <- Git.Config.read =<< Git.Construct.fromCurrent _ <- Git.Index.override $ tmpIndex g setup g Git.UnionMerge.merge aref bref g -- cgit v1.2.3