mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

git-annex, git-union-merge: Support GIT_DIR and GIT_WORK_TREE.

Browse source 
Note that GIT_WORK_TREE cannot influence GIT_DIR; that is necessary for
git-fake-bare and vcsh type things to work.
This commit is contained in:
Joey Hess 2012-01-13 12:52:09 -04:00
parent daff9029ba
commit 1ae780ee79
6 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
git-union-merge.hs
View file

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