mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
grep: fix word-regexp at the beginning of lines
After bol is forwarded, it doesn't represent the beginning of the line
any more. This means that the beginning-of-line marker (^) mustn't match,
i.e. the regex flag REG_NOTBOL needs to be set.
This bug was introduced by fb62eb7fab
("grep -w: forward to next possible position after rejected match").
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e701fadb9e
commit
dbb6a4ada6
2 changed files with 9 additions and 1 deletions
1
grep.c
1
grep.c
|
@ -360,6 +360,7 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
|
||||||
bol = pmatch[0].rm_so + bol + 1;
|
bol = pmatch[0].rm_so + bol + 1;
|
||||||
while (word_char(bol[-1]) && bol < eol)
|
while (word_char(bol[-1]) && bol < eol)
|
||||||
bol++;
|
bol++;
|
||||||
|
eflags |= REG_NOTBOL;
|
||||||
if (bol < eol)
|
if (bol < eol)
|
||||||
goto again;
|
goto again;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,13 @@ test_expect_success setup '
|
||||||
echo foo mmap bar_mmap
|
echo foo mmap bar_mmap
|
||||||
echo foo_mmap bar mmap baz
|
echo foo_mmap bar mmap baz
|
||||||
} >file &&
|
} >file &&
|
||||||
|
echo ww w >w &&
|
||||||
echo x x xx x >x &&
|
echo x x xx x >x &&
|
||||||
echo y yy >y &&
|
echo y yy >y &&
|
||||||
echo zzz > z &&
|
echo zzz > z &&
|
||||||
mkdir t &&
|
mkdir t &&
|
||||||
echo test >t/t &&
|
echo test >t/t &&
|
||||||
git add file x y z t/t &&
|
git add file w x y z t/t &&
|
||||||
test_tick &&
|
test_tick &&
|
||||||
git commit -m initial
|
git commit -m initial
|
||||||
'
|
'
|
||||||
|
@ -48,6 +49,12 @@ do
|
||||||
diff expected actual
|
diff expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success "grep -w $L (w)" '
|
||||||
|
: >expected &&
|
||||||
|
! git grep -n -w -e "^w" >actual &&
|
||||||
|
test_cmp expected actual
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success "grep -w $L (x)" '
|
test_expect_success "grep -w $L (x)" '
|
||||||
{
|
{
|
||||||
echo ${HC}x:1:x x xx x
|
echo ${HC}x:1:x x xx x
|
||||||
|
|
Loading…
Reference in a new issue