summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-12 14:01:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-12 14:01:24 -0400
commit10b9d2a64ce67cd6cf1dae98b589000886c5a722 (patch)
tree85a2f449fe3d903b7b6ae4419d737e590ee918b0 /Git
parentdf72d6c6578b8a50adfd4e3dff2fb24611295031 (diff)
status: Ignore new files that are gitignored.
Diffstat (limited to 'Git')
-rw-r--r--Git/LsFiles.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs
index 8aaa09067..e1558456f 100644
--- a/Git/LsFiles.hs
+++ b/Git/LsFiles.hs
@@ -66,11 +66,12 @@ modified l repo = pipeNullSplit params repo
where
params = [Params "ls-files --modified -z --"] ++ map File l
-{- Files that have been modified or are not checked into git. -}
+{- Files that have been modified or are not checked into git (and are not
+ - ignored). -}
modifiedOthers :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
modifiedOthers l repo = pipeNullSplit params repo
where
- params = [Params "ls-files --modified --others -z --"] ++ map File l
+ params = [Params "ls-files --modified --others --exclude-standard -z --"] ++ map File l
{- Returns a list of all files that are staged for commit. -}
staged :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)