mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

status: Ignore new files that are gitignored.

Browse source
This commit is contained in:
Joey Hess 2013-12-12 14:01:24 -04:00
parent 99096622ad
commit 625076f9a5
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Git/LsFiles.hs
View file

@ -66,11 +66,12 @@ modified l repo = pipeNullSplit params repo
where where
params = [Params "ls-files --modified -z --"] ++ map File l 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 :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
modifiedOthers l repo = pipeNullSplit params repo modifiedOthers l repo = pipeNullSplit params repo
where 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. -} {- Returns a list of all files that are staged for commit. -}
staged :: [FilePath] -> Repo -> IO ([FilePath], IO Bool) staged :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)

1
debian/changelog vendored
View file

@ -24,6 +24,7 @@ git-annex (5.20131131) UNRELEASED; urgency=low
bad behavior in Chromium. bad behavior in Chromium.
* repair: Improve repair of git-annex index file. * repair: Improve repair of git-annex index file.
* repair: Remove damaged git-annex sync branches. * 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 -- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400

2
doc/bugs/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn
View file

@ -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? 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 :) Thanks for your time :)
> [[fixed|done]] --[[Joey]]