From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 May 2006 01:27:56 +0000 (-0700)
Subject: builtin-grep: -w fix
X-Git-Tag: v1.4.0-rc1~142^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02ab1c490dc4827446c851468eb01ecc23b6cc48;p=git.git

builtin-grep: -w fix

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-grep.c b/builtin-grep.c
index d290074af..52ac521af 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;