export CreateProcess fields from Utility.Process
update code to avoid cwd and env redefinition warnings
This commit is contained in:
parent
6eb5e6c135
commit
a44fd2c019
31 changed files with 458 additions and 480 deletions
|
@ -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."
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue