Re: [PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-28 Thread Jeff King
On Fri, Dec 28, 2012 at 03:05:30PM +0100, Antoine Pelisse wrote: > Using the example from Michael's mail, I end up having this: > $ git status --porcelain --ignored > ?? .gitignore > ?? x > ?? y/ > !! x.ignore-me > !! y/ > > y/ is referred as untracked, because it contains untracked files, and >

Re: [PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-28 Thread Antoine Pelisse
Hey Peff, I actually have an issue with the behavior we discussed (referenced as 1.A.) Using the example from Michael's mail, I end up having this: $ git status --porcelain --ignored ?? .gitignore ?? x ?? y/ !! x.ignore-me !! y/ y/ is referred as untracked, because it contains untracked files, an

Re: [PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-27 Thread Antoine Pelisse
> By "committed", I assume you meat that you have "dirA/unco" as an > untracked file, and "dirA/committed" as a file in the index? Of course, > Thanks for putting this together. I agree with the expected output in > each case, and I think this covers the cases we have seen (case 1 is > Michael's

Re: [PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-27 Thread Antoine Pelisse
> Nicely analysed. Perhaps we would want new test pieces to define > the behaviour we want to see first? I think we should. I also thought about the use case of "committed" and ignored directory which is also broken to me (point 3 in the table below). Anyway I tried to make a table to sum-up/di

Re: [PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-27 Thread Jeff King
On Thu, Dec 27, 2012 at 05:14:54PM +0100, Antoine Pelisse wrote: > > Nicely analysed. Perhaps we would want new test pieces to define > > the behaviour we want to see first? > > I think we should. > > I also thought about the use case of "committed" and ignored directory > which is also broken

Re: [PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-26 Thread Junio C Hamano
Jeff King writes: > IOW, given: > > git init > mkdir untracked ignored > >untracked/file > >ignored/file > echo ignored >.git/info/exclude > > I would expect: > > $ git status --short --ignored --untracked=normal > ?? untracked/ > !! ignored/ Sensible. > $ git status --short -

Re: [PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-26 Thread Jeff King
On Wed, Dec 26, 2012 at 06:37:55PM -0800, Junio C Hamano wrote: > Antoine Pelisse writes: > > > When looking for ignored files, we do not recurse into untracked > > directory, and simply consider the directory ignored status. > > When asked to show ignored ones, instead of listing all ignored >

Re: [PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-26 Thread Junio C Hamano
Antoine Pelisse writes: > When looking for ignored files, we do not recurse into untracked > directory, and simply consider the directory ignored status. When asked to show ignored ones, instead of listing all ignored files in such a directory, we just say "everything in this directory is ignore

[PATCH v2] wt-status: Show ignored files in untracked dirs

2012-12-26 Thread Antoine Pelisse
When looking for ignored files, we do not recurse into untracked directory, and simply consider the directory ignored status. As a consequence, we don't see ignored files in those directories. Change that behavior by recursing into untracked directories, if not ignored themselves, searching for ig