diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-12 14:01:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-12 14:01:24 -0400 |
| commit | 10b9d2a64ce67cd6cf1dae98b589000886c5a722 (patch) | |
| tree | 85a2f449fe3d903b7b6ae4419d737e590ee918b0 | |
| parent | df72d6c6578b8a50adfd4e3dff2fb24611295031 (diff) | |
status: Ignore new files that are gitignored.
| -rw-r--r-- | Git/LsFiles.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn | 2 |
3 files changed, 6 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) diff --git a/debian/changelog b/debian/changelog index 529118f00..9eb68ce77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ git-annex (5.20131131) UNRELEASED; urgency=low bad behavior in Chromium. * repair: Improve repair of git-annex index file. * repair: Remove damaged git-annex sync branches. + * status: Ignore new files that are gitignored. -- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400 diff --git a/doc/bugs/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn b/doc/bugs/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn index f91c8bf79..27bdc3241 100644 --- a/doc/bugs/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn +++ b/doc/bugs/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn @@ -14,3 +14,5 @@ So I have this .gitignore file: and when I do *git annex add .* it works as expected: It adds only ~/web and ~/Desktop/Work... but when I do *git annex status* it shows me the entire /home... it seems that *git annex status* doesn't use .gitignore... is this a bug or an intended behavior? Thanks for your time :) + +> [[fixed|done]] --[[Joey]] |