From: Jeff King <peff@peff.net>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git <git@vger.kernel.org>
Subject: Re: [PATCH v2] wt-status: Show ignored files in untracked dirs
Date: Thu, 27 Dec 2012 11:19:20 -0500 [thread overview]
Message-ID: <20121227161920.GA28162@sigill.intra.peff.net> (raw)
In-Reply-To: <CALWbr2wFg_9oDoZ_BUQwAzVV+UJSqBQRrMYmt6fv=fo02RL7Zg@mail.gmail.com>
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 to me (point 3 in the table below).
By "committed", I assume you meat that you have "dirA/unco" as an
untracked file, and "dirA/committed" as a file in the index?
> Anyway I tried to make a table to sum-up/discuss the list of behaviors
> we would like to see/test, taking Jeff mail into account.
> (warning: that requires fixed width font)
>
> |----------------------+---------------------+---------------------------|
> | Output | A. status --ignored | B. status --ignored -uall |
> | | | (or with potential |
> | | | --ignored=all) |
> |----------------------+---------------------+---------------------------|
> | 1. Untracked dirU | Current: | Current: |
> | with ignored unco.ig | Empty | Empty |
> | in it | | |
> | | Expected: | Expected: |
> | | !!dirU/ | !!dirU/unco.ig |
> |----------------------+---------------------+---------------------------|
> | 2. Untracked and | Current (OK): | Current: |
> | ignored dirU with | !!dirU/ | !!dirU/ |
> | file in it | | |
> | | | Expected: |
> | | | !!dirU/unco |
> |----------------------+---------------------+---------------------------|
> | 3. "Committed" dirA | Current: | Current: |
> | yet ignored | Empty | Empty |
> | with uncommitted | | |
> | file in it | Expected: | Expected: |
> | | dirA/ | dirA/unco |
> |----------------------+---------------------+---------------------------|
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 original report, case 2 is what I wrote in my mail, and case 3
is the one you just came up with). I can't think offhand of any others.
-Peff
next prev parent reply other threads:[~2012-12-27 16:19 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
2012-12-27 16:14 ` Antoine Pelisse
2012-12-27 16:19 ` Jeff King [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121227161920.GA28162@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).