diff options
author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2011-08-01 19:20:53 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-01 16:09:15 -0700 |
commit | ba8ea7496f2b95c49fccb72ed6b332afbd865e7b (patch) | |
tree | c52a2d2007a2e209813df918dede0b05bbd08be8 /t | |
parent | Merge branch 'maint' (diff) | |
download | tgif-ba8ea7496f2b95c49fccb72ed6b332afbd865e7b.tar.xz |
grep: add option to show whole function as context
Add a new option, -W, to show the whole surrounding function of a match.
It uses the same regular expressions as -p and diff to find the beginning
of sections.
Currently it will not display comments in front of a function, but those
that are following one. Despite this shortcoming it is already useful,
e.g. to simply see a more complete applicable context or to extract whole
functions.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-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 a29ae45b39..0d600163c8 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -509,6 +509,20 @@ test_expect_success 'grep -p -B5' ' test_cmp expected actual ' +cat >expected <<EOF +hello.c=int main(int argc, const char **argv) +hello.c-{ +hello.c- printf("Hello world.\n"); +hello.c: return 0; +hello.c- /* char ?? */ +hello.c-} +EOF + +test_expect_success 'grep -W' ' + git grep -W return >actual && + test_cmp expected actual +' + test_expect_success 'grep from a subdirectory to search wider area (1)' ' mkdir -p s && ( |