diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-01-13 12:52:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-01-13 12:52:09 -0400 |
| commit | 1ae780ee7990dc542a61714522c902754e76fb05 (patch) | |
| tree | 1adfc326dc9110dcf7421304980103b981a6701d /git-union-merge.hs | |
| parent | daff9029ba85cee772b707add61e8ce1d7fd953f (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 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |