From: Junio C Hamano <gitster@pobox.com>
To: Jameson Miller <jameson.miller81@gmail.com>
Cc: bmwill@google.com, git@vger.kernel.org, jamill@microsoft.com,
peff@peff.net, sbeller@google.com
Subject: Re: [PATCH v2 4/5] Expand support for ignored arguments on status
Date: Thu, 12 Oct 2017 12:58:43 +0900 [thread overview]
Message-ID: <xmqqinfl10gc.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171011133504.15049-5-jamill@microsoft.com> (Jameson Miller's message of "Wed, 11 Oct 2017 09:35:03 -0400")
Jameson Miller <jameson.miller81@gmail.com> writes:
> Teach status command to handle matching ignored mode when showing
> untracked files with the normal option.
>
> Signed-off-by: Jameson Miller <jamill@microsoft.com>
> ---
> dir.c | 20 ++++++++++++++++++--
> 1 file changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/dir.c b/dir.c
> index b9af87eca9..8636d080b2 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1585,6 +1585,7 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
> {
> int exclude;
> int has_path_in_index = !!index_file_exists(istate, path->buf, path->len, ignore_case);
> + enum path_treatment path_treatment;
>
> if (dtype == DT_UNKNOWN)
> dtype = get_dtype(de, istate, path->buf, path->len);
> @@ -1631,8 +1632,23 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
> return path_none;
> case DT_DIR:
> strbuf_addch(path, '/');
> - return treat_directory(dir, istate, untracked, path->buf, path->len,
> - baselen, exclude, pathspec);
> + path_treatment = treat_directory(dir, istate, untracked,
> + path->buf, path->len,
> + baselen, exclude, pathspec);
> + /*
> + * If we are only want to return directories that
> + * match an exclude pattern, and this directories does
s/are //; s/directories/directory/
> + * not match an exclude pattern but all contents are
> + * excluded, then indicate that we should recurse into
> + * this directory (instead of marking the directory
> + * itself as an ignored path)
> + */
> + if (!exclude &&
> + path_treatment == path_excluded &&
> + (dir->flags & DIR_SHOW_IGNORED_TOO) &&
> + (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING))
> + return path_recurse;
> + return path_treatment;
The required change to the code is surprisingly small ;-) and it is
well explained in the comment. Good job.
> case DT_REG:
> case DT_LNK:
> return exclude ? path_excluded : path_untracked;
next prev parent reply other threads:[~2017-10-12 3:58 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 20:54 [PATCH 0/6] Teach Status options around showing ignored files jameson.miller81
2017-10-05 20:54 ` [PATCH 1/6] Teach status " jameson.miller81
2017-10-05 20:54 ` [PATCH 2/6] Update documentation for new directory and status logic jameson.miller81
2017-10-05 21:51 ` Stefan Beller
2017-10-05 20:54 ` [PATCH 3/6] Add tests for git status `--ignored=matching` jameson.miller81
2017-10-05 21:59 ` Stefan Beller
2017-10-05 20:54 ` [PATCH 4/6] Expand support for ignored arguments on status jameson.miller81
2017-10-05 20:54 ` [PATCH 5/6] Add tests around status handling of ignored arguments jameson.miller81
2017-10-05 20:54 ` [PATCH 6/6] Handle unsupported combination status arguments jameson.miller81
2017-10-05 22:08 ` Stefan Beller
2017-10-05 21:16 ` [PATCH 0/6] Teach Status options around showing ignored files Jonathan Nieder
2017-10-05 21:22 ` Jameson Miller
2017-10-11 13:34 ` [PATCH v2 0/5] " Jameson Miller
2017-10-11 13:35 ` [PATCH v2 1/5] Teach status " Jameson Miller
2017-10-12 2:49 ` Junio C Hamano
2017-10-12 20:15 ` Jameson Miller
2017-10-11 13:35 ` [PATCH v2 2/5] Update documentation for new directory and status logic Jameson Miller
2017-10-12 2:55 ` Junio C Hamano
2017-10-12 20:54 ` Jameson Miller
2017-10-13 0:42 ` Junio C Hamano
2017-10-11 13:35 ` [PATCH v2 3/5] Add tests for git status `--ignored=matching` Jameson Miller
2017-10-11 13:35 ` [PATCH v2 4/5] Expand support for ignored arguments on status Jameson Miller
2017-10-12 3:58 ` Junio C Hamano [this message]
2017-10-11 13:35 ` [PATCH v2 5/5] Add tests around status handling of ignored arguments Jameson Miller
2017-10-12 4:06 ` Junio C Hamano
2017-10-12 20:16 ` Jameson Miller
2017-10-13 0:49 ` Junio C Hamano
2017-10-12 2:33 ` [PATCH v2 0/5] Teach Status options around showing ignored files Junio C Hamano
2017-10-12 20:20 ` Jameson Miller
2017-10-19 16:05 ` [PATCH v3 0/4] status: add option to show ignored files differently Jameson Miller
2017-10-19 16:05 ` [PATCH v3 1/4] " Jameson Miller
2017-10-23 3:34 ` Junio C Hamano
2017-10-19 16:05 ` [PATCH v3 2/4] status: report matching ignored and normal untracked Jameson Miller
2017-10-19 16:06 ` [PATCH v3 3/4] status: document options to show matching ignored files Jameson Miller
2017-10-19 16:06 ` [PATCH v3 4/4] status: test --ignored=matching Jameson Miller
2017-10-19 19:33 ` Stefan Beller
2017-10-22 2:10 ` Junio C Hamano
2017-10-23 4:46 ` [PATCH v3 0/4] status: add option to show ignored files differently Junio C Hamano
2017-10-23 17:05 ` [PATCH v4 " Jameson Miller
2017-10-23 17:05 ` [PATCH v4 1/4] " Jameson Miller
2017-10-23 17:05 ` [PATCH v4 2/4] status: report matching ignored and normal untracked Jameson Miller
2017-10-23 17:05 ` [PATCH v4 3/4] status: document options to show matching ignored files Jameson Miller
2017-10-23 17:05 ` [PATCH v4 4/4] status: test ignored modes Jameson Miller
2017-10-30 17:21 ` [PATCH v5 0/4] status: add option to show ignored files differently jameson.miller81
2017-10-30 17:21 ` [PATCH v5 1/4] " jameson.miller81
2017-10-30 17:21 ` [PATCH v5 2/4] status: report matching ignored and normal untracked jameson.miller81
2017-10-30 17:21 ` [PATCH v5 3/4] status: document options to show matching ignored files jameson.miller81
2017-10-30 17:21 ` [PATCH v5 4/4] status: test ignored modes jameson.miller81
2017-10-31 3:16 ` [PATCH v5 0/4] status: add option to show ignored files differently Junio C Hamano
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=xmqqinfl10gc.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=jameson.miller81@gmail.com \
--cc=jamill@microsoft.com \
--cc=peff@peff.net \
--cc=sbeller@google.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.
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).