summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2018-06-22 15:49:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-22 19:59:02 (GMT)
commit017c0fcfdb21dd44e2c83f533e9a6d78513e7d8c (patch)
tree727ae1d2986326a63f441f1531491ae978ddfadf /grep.h
parent68d686e6af0fc192fce1788f67bbe0c21a5419ab (diff)
downloadgit-017c0fcfdb21dd44e2c83f533e9a6d78513e7d8c.zip
git-017c0fcfdb21dd44e2c83f533e9a6d78513e7d8c.tar.gz
git-017c0fcfdb21dd44e2c83f533e9a6d78513e7d8c.tar.bz2
grep.[ch]: extend grep_opt to allow showing matched column
To support showing the matched column when calling 'git-grep(1)', teach 'grep_opt' the normal set of options to configure the default behavior and colorization of this feature. Now that we have opt->columnnum, use it to disable short-circuiting over ORs and ANDs so that col and icol are always filled with the earliest matches on each line. In addition, don't return the first match from match_line(), for the same reason. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/grep.h b/grep.h
index 399381c..08a0b39 100644
--- a/grep.h
+++ b/grep.h
@@ -127,6 +127,7 @@ struct grep_opt {
int prefix_length;
regex_t regexp;
int linenum;
+ int columnnum;
int invert;
int ignore_case;
int status_only;
@@ -159,6 +160,7 @@ struct grep_opt {
char color_filename[COLOR_MAXLEN];
char color_function[COLOR_MAXLEN];
char color_lineno[COLOR_MAXLEN];
+ char color_columnno[COLOR_MAXLEN];
char color_match_context[COLOR_MAXLEN];
char color_match_selected[COLOR_MAXLEN];
char color_selected[COLOR_MAXLEN];