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

export CreateProcess fields from Utility.Process

Browse source 
update code to avoid cwd and env redefinition warnings
This commit is contained in:
Joey Hess 2014-06-10 19:20:14 -04:00
parent 6eb5e6c135
commit a44fd2c019
31 changed files with 458 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Git/CurrentRepo.hs
View file

@ -37,8 +37,8 @@ get = do
case wt of
Nothing -> return r
Just d -> do
cwd <- getCurrentDirectory
unless (d `dirContains` cwd) $
curr <- getCurrentDirectory
unless (d `dirContains` curr) $
setCurrentDirectory d
return $ addworktree wt r
where
@ -57,8 +57,8 @@ get = do
configure Nothing (Just r) = Git.Config.read r
configure (Just d) _ = do
absd <- absPath d
cwd <- getCurrentDirectory
r <- newFrom $ Local { gitdir = absd, worktree = Just cwd }
curr <- getCurrentDirectory
r <- newFrom $ Local { gitdir = absd, worktree = Just curr }
Git.Config.read r
configure Nothing Nothing = error "Not in a git repository."