From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Antoine Pelisse <apelisse@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v2] wt-status: Show ignored files in untracked dirs
Date: Wed, 26 Dec 2012 21:08:19 -0800 [thread overview]
Message-ID: <7va9t0m69o.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20121227034859.GA20817@sigill.intra.peff.net> (Jeff King's message of "Wed, 26 Dec 2012 22:48:59 -0500")
Jeff King <peff@peff.net> 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 --ignored --untracked=all
> ?? untracked/file
> !! ignored/file
Again sensible; OK, --untracked=all is what I was missing.
> I do not know if anybody cares about the distinction, but optionally we
> could give --ignored its own selector, like:
>
> $ git status --short --ignored=all --untracked=normal
> ?? untracked/
> !! ignored/file
>
> where obviously it would default to "none" (whereas untracked defaults
> to "normal").
We could just say the selector for the ignored implicitly follows
what is given for --untracked, if we don't care.
> But the behavior with Antoine's patch is:
>
> $ git status --short --ignored --untracked=normal
> ?? untracked/
> !! ignored
>
> $ git status --short --ignored --untracked=all
> ?? untracked/file
> !! ignored
>
> which seems wrong to me for two reasons:
>
> 1. It does not recurse for ignored but untracked entries. Neither does
> the current code, but I think it should.
>
> 2. It loses the trailing slash from the ignored directory in both
> cases (which is printed by the current code).
Nicely analysed. Perhaps we would want new test pieces to define
the behaviour we want to see first?
next prev parent reply other threads:[~2012-12-27 5:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-26 5:57 Bug in git status Michael Haggerty
2012-12-26 10:16 ` [PATCH] wt-status: Show ignored files in untracked dirs Antoine Pelisse
2012-12-26 13:31 ` [PATCH v2] " Antoine Pelisse
2012-12-27 2:37 ` Junio C Hamano
2012-12-27 3:48 ` Jeff King
2012-12-27 5:08 ` Junio C Hamano [this message]
2012-12-27 16:14 ` Antoine Pelisse
2012-12-27 16:19 ` Jeff King
2012-12-27 17:35 ` Antoine Pelisse
2012-12-28 14:05 ` Antoine Pelisse
2012-12-29 7:22 ` Jeff King
2012-12-30 14:39 ` [PATCH 1/2] dir.c: Make git-status --ignored more consistent Antoine Pelisse
2012-12-30 14:54 ` Antoine Pelisse
2012-12-30 15:01 ` Adam Spiers
2012-12-30 21:36 ` Junio C Hamano
2012-12-30 14:39 ` [PATCH 2/2] git-status: Test --ignored behavior Antoine Pelisse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7va9t0m69o.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).