diff options
author | Joey Hess <joey@kitenet.net> | 2010-10-12 02:40:09 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-10-12 02:40:09 -0400 |
commit | 8f069bd2875022cfceb0c50cb9a5667a9bae88d8 (patch) | |
tree | 14730a32c4defc0fa2982f813f55f801041dce93 | |
parent | 97b31a525e31abf1db95154d09c7efa368d3f59c (diff) |
tweak
-rw-r--r-- | Annex.hs | 2 | ||||
-rw-r--r-- | GitRepo.hs | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -31,7 +31,7 @@ annexDir repo key = gitDir repo ++ "/annex/" ++ key - later. -} startAnnex :: IO State startAnnex = do - r <- gitRepoCurrent + r <- gitRepoFromCwd gitPrep r return State { diff --git a/GitRepo.hs b/GitRepo.hs index 27fc0632c..643b725e6 100644 --- a/GitRepo.hs +++ b/GitRepo.hs @@ -7,7 +7,7 @@ module GitRepo ( GitRepo, - gitRepoCurrent, + gitRepoFromCwd, gitRepoFromPath, gitRepoFromUrl, gitWorkTree, @@ -183,8 +183,8 @@ gitConfigRemotes repo = mapM construct remotes else gitRepoFromPath r {- Finds the current git repository, which may be in a parent directory. -} -gitRepoCurrent :: IO GitRepo -gitRepoCurrent = do +gitRepoFromCwd :: IO GitRepo +gitRepoFromCwd = do cwd <- getCurrentDirectory top <- seekUp cwd isRepoTop case top of |