From 02ab1c490dc4827446c851468eb01ecc23b6cc48 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 9 May 2006 18:27:56 -0700 Subject: [PATCH] builtin-grep: -w fix Signed-off-by: Junio C Hamano --- builtin-grep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin-grep.c b/builtin-grep.c index d290074af2..52ac521afe 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -241,10 +241,10 @@ static int grep_buffer(struct grep_opt *opt, const char *name, die("regexp returned nonsense"); if (pmatch[0].rm_so != 0 && word_char(bol[pmatch[0].rm_so-1])) - continue; /* not a word boundary */ - if ((eol-bol) < pmatch[0].rm_eo && + hit = 0; + if (pmatch[0].rm_eo != (eol-bol) && word_char(bol[pmatch[0].rm_eo])) - continue; /* not a word boundary */ + hit = 0; } if (hit) break; -- 2.11.4.GIT