diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2011-12-12 22:16:06 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-12-12 15:45:42 -0800 |
| commit | b8ffedca6f9e1043956ba611ae52bea449779456 (patch) | |
| tree | 51725ec80c72f114e83e40091b5dc36f4737cf8e /t/t7810-grep.sh | |
| parent | Update draft release notes for 1.7.9 (diff) | |
| download | tgif-b8ffedca6f9e1043956ba611ae52bea449779456.tar.xz | |
grep: load funcname patterns for -W
git-grep avoids loading the funcname patterns unless they are needed.
ba8ea74 (grep: add option to show whole function as context,
2011-08-01) forgot to extend this test also to the new funcbody
feature. Do so.
The catch is that we also have to disable threading when using
userdiff, as explained in grep_threads_ok(). So we must be careful to
introduce the same test there.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7810-grep.sh')
| -rwxr-xr-x | t/t7810-grep.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 81263b7851..7ba5b16f99 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -523,6 +523,20 @@ test_expect_success 'grep -W' ' test_cmp expected actual ' +cat >expected <<EOF +hello.c= printf("Hello world.\n"); +hello.c: return 0; +hello.c- /* char ?? */ +EOF + +test_expect_success 'grep -W with userdiff' ' + test_when_finished "rm -f .gitattributes" && + git config diff.custom.xfuncname "(printf.*|})$" && + echo "hello.c diff=custom" >.gitattributes && + git grep -W return >actual && + test_cmp expected actual +' + test_expect_success 'grep from a subdirectory to search wider area (1)' ' mkdir -p s && ( |