diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-05-18 18:20:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-05-18 18:20:53 -0400 |
| commit | eb6cb1b87f2d7016ddd4386e2a3bb20d8ea3c036 (patch) | |
| tree | 1f9f35e7ca3db662bd67ec759de90267149319fa /git-union-merge.hs | |
| parent | bb4f31a0ee496ffb83d31cc56f8827e47605d763 (diff) | |
Add support for core.worktree, and fix support for GIT_WORK_TREE and GIT_DIR.
The environment needs to override git-config. Changed when git config is
read, and avoid rereading it once it's been read.
chdir for both worktree settings.
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index 182d8cf79..2c2e7a46b 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -10,7 +10,7 @@ import System.Environment import Common import qualified Git.UnionMerge import qualified Git.Config -import qualified Git.Construct +import qualified Git.CurrentRepo import qualified Git.Branch import qualified Git.Index import qualified Git @@ -40,7 +40,7 @@ parseArgs = do main :: IO () main = do [aref, bref, newref] <- map Git.Ref <$> parseArgs - g <- Git.Config.read =<< Git.Construct.fromCurrent + g <- Git.Config.read =<< Git.CurrentRepo.get _ <- Git.Index.override $ tmpIndex g setup g Git.UnionMerge.merge aref bref g |