diff options
| author | Joey Hess <joey@kitenet.net> | 2014-01-13 18:10:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-13 18:10:21 -0400 |
| commit | 14ce1badd4210ebb2660e0fb22ba4ff7f2986dee (patch) | |
| tree | a0eb1548d7d879631cef51266e8f2ee65fa7a66f /Git/LsFiles.hs | |
| parent | dd1d8e69d4c190c7bb60d5187f7a889c6fea0d62 (diff) | |
| download | git-repair-14ce1badd4210ebb2660e0fb22ba4ff7f2986dee.tar.gz | |
merge from git-annex
Diffstat (limited to 'Git/LsFiles.hs')
| -rw-r--r-- | Git/LsFiles.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs index 8aaa090..e155845 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) |