diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-17 14:40:53 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-17 14:42:06 -0400 |
| commit | 49ac40c1e90a2a32a2728e36f02a0f3baa854c8b (patch) | |
| tree | d094e3d761dd06b065c94f9265bc99afcce23dcc /git-union-merge.hs | |
| parent | 323e3665c2526c6560f71efb013543dd068eb612 (diff) | |
unify handling of unusual GIT_INDEX_FILE relative path
This is probably a git bug that stuck in its interface.
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 693064045..3bf628c75 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -41,7 +41,7 @@ main :: IO () main = do [aref, bref, newref] <- map Git.Ref <$> parseArgs g <- Git.Config.read =<< Git.CurrentRepo.get - _ <- Git.Index.override $ tmpIndex g + _ <- Git.Index.override (tmpIndex g) g setup g Git.UnionMerge.merge aref bref g _ <- Git.Branch.commit Git.Branch.ManualCommit False "union merge" newref [aref, bref] g |