Re: [PATCH] builtin-grep: workaround for non GNU grep.
- From
Junio C Hamano <junkio@cox.net>
- Date
- May 17, 2006, 17:41 UTC
- Message-ID
- <7vlkt0ft0x.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <Pine.LNX.4.64.0605170722590.10823@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
Show 12 quoted lines
>> - if (!cached) {
>> + if (!cached &&
>> + (!NO_H_OPTION_IN_GREP ||
>> + (!opt->count && !opt->unmatch_name_only))) {
>> hit = external_grep(opt, paths, cached);
>> if (hit >= 0)
>> return hit;
>
> That's the ugliest test ever, and at all the wrong levels.
>
> Just make "external_grep()" test for the cases that it cannot handle, and
> return -1. That's how it's designed to work.Ah.... *BLUSH* I was not thinking when I saw that "if (hit >= 0)" stuff. Yes, you made it to fall back.