Re: [PATCH 6/8] grep: make it clear i-t-a entries are ignored

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 25, 2015, 17:37 UTC
Message-ID: <xmqq37z71d7o.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1440205700-19749-7-git-send-email-pclouds@gmail.com>

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.

Show 18 quoted lines

> 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;