diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-21 16:35:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-21 16:35:23 -0400 |
| commit | 619c8bd261a4fee0b0d40b664e55c51782e062f7 (patch) | |
| tree | ba39cd283d4c0fecb61c7a1bbbb803cc9459a222 /Git/CurrentRepo.hs | |
| parent | 7882653e7856df87e598464379951ec89775cd1a (diff) | |
| download | git-repair-619c8bd261a4fee0b0d40b664e55c51782e062f7.tar.gz | |
Merge from git-annex.
Diffstat (limited to 'Git/CurrentRepo.hs')
| -rw-r--r-- | Git/CurrentRepo.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs index ee91a6b..23ebbbc 100644 --- a/Git/CurrentRepo.hs +++ b/Git/CurrentRepo.hs @@ -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." |