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

avoid withWorkTreeRelated affecting annex symlink calculation

Browse source
This commit is contained in:
Joey Hess 2016-04-08 14:24:00 -04:00
parent f41045bf19
commit 251405eca2
Failed to extract signature
5 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Git/Command.hs
View file

@ -17,9 +17,11 @@ import qualified Utility.CoProcess as CoProcess
{- Constructs a git command line operating on the specified repo. -}
gitCommandLine :: [CommandParam] -> Repo -> [CommandParam]
gitCommandLine params r@(Repo { location = l@(Local { } ) }) =
setdir : settree ++ gitGlobalOpts r ++ params
setdir ++ settree ++ gitGlobalOpts r ++ params
where
setdir = Param $ "--git-dir=" ++ gitdir l
setdir
| gitEnvOverridesGitDir r = []
| otherwise = [Param $ "--git-dir=" ++ gitdir l]
settree = case worktree l of
Nothing -> []
Just t -> [Param $ "--work-tree=" ++ t]