From 625076f9a598e86fe125f9afe9ff341427fe2ca8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Dec 2013 14:01:24 -0400 Subject: [PATCH] status: Ignore new files that are gitignored. --- Git/LsFiles.hs | 5 +++-- debian/changelog | 1 + ...ex_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 8aaa09067f..e1558456f1 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 529118f008..9eb68ce777 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 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 f91c8bf797..27bdc32417 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]]