grep.c: add configuration variables to show matched option

To support git-grep(1)'s new option, '--column', document and teach
grep.c how to interpret relevant configuration options, similar to those
associated with '--line-number'.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 58fde4daeadb0894f9786125c5e1e871bcaf2ba1..e4cbed3078aceafc2fdbe3aa493b2ebb9a6b3888 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1183,6 +1183,8 @@ color.grep.<slot>::
        function name lines (when using `-p`)
 `lineNumber`;;
        line number prefix (when using `-n`)
        function name lines (when using `-p`)
 `lineNumber`;;
        line number prefix (when using `-n`)

+`column`;;
+       column number prefix (when using `--column`)

 `match`;;
        matching text (same as setting `matchContext` and `matchSelected`)
 `matchContext`;;
 `match`;;
        matching text (same as setting `matchContext` and `matchSelected`)
 `matchContext`;;


@@ -1797,6 +1799,9 @@ gitweb.snapshot::
 grep.lineNumber::
        If set to true, enable `-n` option by default.
 
 grep.lineNumber::
        If set to true, enable `-n` option by default.
 

+grep.column::
+       If set to true, enable the `--column` option by default.
+

 grep.patternType::
        Set the default matching behavior. Using a value of 'basic', 'extended',
        'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
 grep.patternType::
        Set the default matching behavior. Using a value of 'basic', 'extended',
        'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 31dc0392a6a5f0d74d17c360ed20b623255520bb..0de3493b804b3f71fb5c9fc66dbf2a75c6ab0f0c 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -44,6 +44,9 @@ CONFIGURATION
 grep.lineNumber::
        If set to true, enable `-n` option by default.
 
 grep.lineNumber::
        If set to true, enable `-n` option by default.
 

+grep.column::
+       If set to true, enable the `--column` option by default.
+

 grep.patternType::
        Set the default matching behavior. Using a value of 'basic', 'extended',
        'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
 grep.patternType::
        Set the default matching behavior. Using a value of 'basic', 'extended',
        'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,

diff --git a/grep.c b/grep.c
index 83fe32a6a08009d510c8a2e432902414be03a332..992673fe7e62de25afcb168ee6a40d1b8bd06d1d 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -96,6 +96,10 @@ int grep_config(const char *var, const char *value, void *cb)
                opt->linenum = git_config_bool(var, value);
                return 0;
        }
                opt->linenum = git_config_bool(var, value);
                return 0;
        }

+       if (!strcmp(var, "grep.column")) {
+               opt->columnnum = git_config_bool(var, value);
+               return 0;
+       }

 
        if (!strcmp(var, "grep.fullname")) {
                opt->relative = !git_config_bool(var, value);
 
        if (!strcmp(var, "grep.fullname")) {
                opt->relative = !git_config_bool(var, value);


@@ -112,6 +116,8 @@ int grep_config(const char *var, const char *value, void *cb)
                color = opt->color_function;
        else if (!strcmp(var, "color.grep.linenumber"))
                color = opt->color_lineno;
                color = opt->color_function;
        else if (!strcmp(var, "color.grep.linenumber"))
                color = opt->color_lineno;

+       else if (!strcmp(var, "color.grep.column"))
+               color = opt->color_columnno;

        else if (!strcmp(var, "color.grep.matchcontext"))
                color = opt->color_match_context;
        else if (!strcmp(var, "color.grep.matchselected"))
        else if (!strcmp(var, "color.grep.matchcontext"))
                color = opt->color_match_context;
        else if (!strcmp(var, "color.grep.matchselected"))