diff options
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Construct.hs | 16 | ||||
| -rw-r--r-- | Git/CurrentRepo.hs | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/Git/Construct.hs b/Git/Construct.hs index bafb16874..f9f4b464a 100644 --- a/Git/Construct.hs +++ b/Git/Construct.hs @@ -17,6 +17,7 @@ module Git.Construct ( fromRemotes, fromRemoteLocation, repoAbsPath, + newFrom, ) where import System.Posix.User @@ -31,17 +32,16 @@ import Utility.UserInfo {- Finds the git repository used for the cwd, which may be in a parent - directory. -} -fromCwd :: IO Repo -fromCwd = getCurrentDirectory >>= seekUp checkForRepo +fromCwd :: IO (Maybe Repo) +fromCwd = getCurrentDirectory >>= seekUp where - norepo = error "Not in a git repository." - seekUp check dir = do - r <- check dir + seekUp dir = do + r <- checkForRepo dir case r of Nothing -> case parentDir dir of - "" -> norepo - d -> seekUp check d - Just loc -> newFrom loc + "" -> return Nothing + d -> seekUp d + Just loc -> Just <$> newFrom loc {- Local Repo constructor, accepts a relative or absolute path. -} fromPath :: FilePath -> IO Repo diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs index e309bf2f6..482873960 100644 --- a/Git/CurrentRepo.hs +++ b/Git/CurrentRepo.hs @@ -47,15 +47,15 @@ get = do unsetEnv s Just <$> absPath d Nothing -> return Nothing - configure Nothing r = Git.Config.read r - configure (Just d) r = do - r' <- Git.Config.read r - -- Let GIT_DIR override the default gitdir. + + configure Nothing (Just r) = Git.Config.read r + configure (Just d) _ = do absd <- absPath d - return $ changelocation r' $ Local - { gitdir = absd - , worktree = worktree (location r') - } + cwd <- getCurrentDirectory + r <- newFrom $ Local { gitdir = absd, worktree = Just cwd } + Git.Config.read r + configure Nothing Nothing = error "Not in a git repository." + addworktree w r = changelocation r $ Local { gitdir = gitdir (location r), worktree = w } changelocation r l = r { location = l } |