From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org, phiggins@google•com, snoksrud@gmail•com
Subject: Re: [PATCH 6/8] grep: make it clear i-t-a entries are ignored
Date: Tue, 25 Aug 2015 10:37:31 -0700 [thread overview]
Message-ID: <xmqq37z71d7o.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1440205700-19749-7-git-send-email-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Sat, 22 Aug 2015 08:08:09 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> The expression "!S_ISREG(ce)" covers i-t-a entries as well because
> ce->ce_mode would be zero then. I could make a comment saying that, but
> it's probably better just to comment with code, in case i-t-a entry
> content changes in future.
OK. Thanks.
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
> ---
> builtin/grep.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index d04f440..f508179 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -375,7 +375,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
>
> for (nr = 0; nr < active_nr; nr++) {
> const struct cache_entry *ce = active_cache[nr];
> - if (!S_ISREG(ce->ce_mode))
> + if (!S_ISREG(ce->ce_mode) || ce_intent_to_add(ce))
> continue;
> if (!ce_path_match(ce, pathspec, NULL))
> continue;
prev parent reply other threads:[~2015-08-25 17:37 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-22 14:29 apply --cached --whitespace=fix now failing on items added with "add -N" Patrick Higgins
2015-06-22 14:45 ` Duy Nguyen
2015-06-22 17:06 ` Junio C Hamano
2015-06-23 12:34 ` [PATCH] apply: fix adding new files on i-t-a entries Nguyễn Thái Ngọc Duy
2015-06-23 16:50 ` Junio C Hamano
2015-06-23 17:37 ` Junio C Hamano
2015-06-24 4:48 ` Junio C Hamano
2015-06-24 10:11 ` Duy Nguyen
2015-06-24 17:05 ` Junio C Hamano
2015-06-25 12:26 ` Duy Nguyen
2015-06-25 13:07 ` Junio C Hamano
2015-08-22 1:08 ` [PATCH 0/8] Resurrect "diff-lib.c: adjust position of i-t-a entries in diff" Nguyễn Thái Ngọc Duy
2015-08-22 1:08 ` [PATCH 1/8] blame: remove obsolete comment Nguyễn Thái Ngọc Duy
2015-08-22 1:08 ` [PATCH 2/8] Add and use convenient macro ce_intent_to_add() Nguyễn Thái Ngọc Duy
2015-08-22 1:08 ` [PATCH 3/8] apply: fix adding new files on i-t-a entries Nguyễn Thái Ngọc Duy
2015-08-25 17:01 ` Junio C Hamano
2015-08-22 1:08 ` [PATCH 4/8] apply: make sure check_preimage() does not leave empty file on error Nguyễn Thái Ngọc Duy
2015-08-25 17:16 ` Junio C Hamano
2015-08-22 1:08 ` [PATCH 5/8] checkout(-index): do not checkout i-t-a entries Nguyễn Thái Ngọc Duy
2015-08-25 17:36 ` Junio C Hamano
2015-11-29 15:31 ` Duy Nguyen
2015-11-30 19:17 ` Junio C Hamano
2015-08-22 1:08 ` [PATCH 6/8] grep: make it clear i-t-a entries are ignored Nguyễn Thái Ngọc Duy
2015-08-22 1:11 ` [PATCH 7/8] diff.h: extend "flags" field to 64 bits because we're out of bits Nguyễn Thái Ngọc Duy
2015-08-25 17:39 ` Junio C Hamano
2015-08-31 10:22 ` Duy Nguyen
2015-08-25 17:37 ` [PATCH 6/8] grep: make it clear i-t-a entries are ignored Junio C Hamano
2015-08-25 17:37 ` Junio C Hamano [this message]
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=xmqq37z71d7o.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
--cc=phiggins@google$(echo .)com \
--cc=snoksrud@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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