summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-16 14:58:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-16 14:58:14 -0400
commitbfa581a218719c46dbc19a212a005b0cf2e145c2 (patch)
treedb42593ad35e3b941fde5f52693af76f28177676
parent5a32804115a73d3c6fb2de17a1f9a6c628beba5d (diff)
bugfix
-rw-r--r--GitRepo.hs16
1 files changed, 8 insertions, 8 deletions
diff --git a/GitRepo.hs b/GitRepo.hs
index 5981a6ca1..76150b309 100644
--- a/GitRepo.hs
+++ b/GitRepo.hs
@@ -25,8 +25,8 @@ module GitRepo (
remotes,
remotesAdd,
repoRemoteName,
- inGit,
- notInGit
+ inRepo,
+ notInRepo
) where
import Directory
@@ -178,16 +178,16 @@ pipeRead repo params = assertlocal repo $ do
{- Passed a location, recursively scans for all files that
- are checked into git at that location. -}
-inGit :: Repo -> FilePath -> IO [FilePath]
-inGit repo location = do
- s <- pipeRead repo ["ls-files", "--cached", "--exclude-standard"]
+inRepo :: Repo -> FilePath -> IO [FilePath]
+inRepo repo location = do
+ s <- pipeRead repo ["ls-files", "--cached", "--exclude-standard", location]
return $ lines s
{- Passed a location, recursively scans for all files that are not checked
- into git, and not gitignored. -}
-notInGit :: Repo -> FilePath -> IO [FilePath]
-notInGit repo location = do
- s <- pipeRead repo ["ls-files", "--others", "--exclude-standard"]
+notInRepo :: Repo -> FilePath -> IO [FilePath]
+notInRepo repo location = do
+ s <- pipeRead repo ["ls-files", "--others", "--exclude-standard", location]
return $ lines s
{- Runs git config and populates a repo with its config. -}