This commit is contained in:
Joey Hess 2010-10-12 02:40:09 -04:00
parent 97b31a525e
commit 8f069bd287
2 changed files with 4 additions and 4 deletions

View file

@ -31,7 +31,7 @@ annexDir repo key = gitDir repo ++ "/annex/" ++ key
- later. -} - later. -}
startAnnex :: IO State startAnnex :: IO State
startAnnex = do startAnnex = do
r <- gitRepoCurrent r <- gitRepoFromCwd
gitPrep r gitPrep r
return State { return State {

View file

@ -7,7 +7,7 @@
module GitRepo ( module GitRepo (
GitRepo, GitRepo,
gitRepoCurrent, gitRepoFromCwd,
gitRepoFromPath, gitRepoFromPath,
gitRepoFromUrl, gitRepoFromUrl,
gitWorkTree, gitWorkTree,
@ -183,8 +183,8 @@ gitConfigRemotes repo = mapM construct remotes
else gitRepoFromPath r else gitRepoFromPath r
{- Finds the current git repository, which may be in a parent directory. -} {- Finds the current git repository, which may be in a parent directory. -}
gitRepoCurrent :: IO GitRepo gitRepoFromCwd :: IO GitRepo
gitRepoCurrent = do gitRepoFromCwd = do
cwd <- getCurrentDirectory cwd <- getCurrentDirectory
top <- seekUp cwd isRepoTop top <- seekUp cwd isRepoTop
case top of case top of