unify handling of unusual GIT_INDEX_FILE relative path

This is probably a git bug that stuck in its interface.
This commit is contained in:
Joey Hess 2016-05-17 14:40:53 -04:00
parent e81b1bc9e7
commit 766728c8cf
Failed to extract signature
4 changed files with 17 additions and 10 deletions

View file

@ -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