From 317f63c21c8eac46813eacf487485445f2f79a6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Mon, 1 Aug 2011 19:22:52 +0200 Subject: [PATCH] grep: long context options Take long option names for -A (--after-context), -B (--before-context) and -C (--context) from GNU grep and add a similar long option name for -W (--function-context). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- Documentation/git-grep.txt | 26 +++++++++++++++++--------- builtin/grep.c | 8 ++++---- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 6cd0c503f..af501d242 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -155,15 +155,6 @@ OPTIONS Show the filename above the matches in that file instead of at the start of each shown line. --[ABC] :: - Show `context` trailing (`A` -- after), or leading (`B` - -- before), or both (`C` -- context) lines, and place a - line containing `--` between contiguous groups of - matches. - --:: - A shortcut for specifying `-C`. - -p:: --show-function:: Show the preceding line that contains the function name of @@ -172,7 +163,24 @@ OPTIONS patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5]). +-:: +-C :: +--context :: + Show leading and trailing lines, and place a line + containing `--` between contiguous groups of matches. + +-A :: +--after-context :: + Show trailing lines, and place a line containing + `--` between contiguous groups of matches. + +-B :: +--before-context :: + Show leading lines, and place a line containing + `--` between contiguous groups of matches. + -W:: +--function-context:: Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was diff --git a/builtin/grep.c b/builtin/grep.c index 1fae66262..185179754 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -827,18 +827,18 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_BOOLEAN(0, "heading", &opt.heading, "show filename only once above matches from same file"), OPT_GROUP(""), - OPT_CALLBACK('C', NULL, &opt, "n", + OPT_CALLBACK('C', "context", &opt, "n", "show context lines before and after matches", context_callback), - OPT_INTEGER('B', NULL, &opt.pre_context, + OPT_INTEGER('B', "before-context", &opt.pre_context, "show context lines before matches"), - OPT_INTEGER('A', NULL, &opt.post_context, + OPT_INTEGER('A', "after-context", &opt.post_context, "show context lines after matches"), OPT_NUMBER_CALLBACK(&opt, "shortcut for -C NUM", context_callback), OPT_BOOLEAN('p', "show-function", &opt.funcname, "show a line with the function name before matches"), - OPT_BOOLEAN('W', NULL, &opt.funcbody, + OPT_BOOLEAN('W', "function-context", &opt.funcbody, "show the surrounding function"), OPT_GROUP(""), OPT_CALLBACK('f', NULL, &opt, "file", -- 2.30.2