mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/maint-grep-word-regexp-fix'

Browse Source 
* rs/maint-grep-word-regexp-fix:
  grep: fix word-regexp at the beginning of lines
This commit is contained in:
Junio C Hamano
2009-05-29 14:59:50 -07:00
parent 3be7e06713 dbb6a4ada6
commit 8e105e3928
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
grep.c
View File

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

9
t/t7002-grep.sh
View File

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