grep -O: Do not pass color sequences as filenames to pager

With a .gitconfig like this:

[color]
ui = auto
[color "grep"]
filename = magenta

if stdout is a terminal, the grep machinery will output the color
sequence \e[36m before each filename in its output.

In the case of "git grep -O foo", output is argv for the pager.
Disable color when calling the grep machinery in this case.

Signed-off-by: Nazri Ramliy <ayiehere@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/grep.c b/builtin/grep.c
index 4b8ddbe0d52d3aa9719372400c24959dc7efd8c2..7a9427d357cf54e02f7f251a509911a7e4a6c936 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -997,6 +997,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        if (show_in_pager == default_pager)
                show_in_pager = git_pager(1);
        if (show_in_pager) {
        if (show_in_pager == default_pager)
                show_in_pager = git_pager(1);
        if (show_in_pager) {

+               opt.color = 0;

                opt.name_only = 1;
                opt.null_following_name = 1;
                opt.output_priv = &path_list;
                opt.name_only = 1;
                opt.null_following_name = 1;
                opt.output_priv = &path_list;

diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index c1104413445b18bb1532931183e1c529632ad527..568a6f2b69ab5003c00f206806c3fe6289f63a98 100755 (executable)
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -125,6 +125,21 @@ test_expect_success 'modified file' '
        test_cmp empty out
 '
 
        test_cmp empty out
 '
 

+test_config() {
+       git config "$1" "$2" &&
+       test_when_finished "git config --unset $1"
+}
+
+test_expect_success 'copes with color settings' '
+       rm -f actual &&
+       echo grep.h >expect &&
+       test_config color.grep always &&
+       test_config color.grep.filename yellow &&
+       test_config color.grep.separator green &&
+       git grep -O'\''printf "%s\n" >actual'\'' GREP_AND &&
+       test_cmp expect actual
+'
+

 test_expect_success 'run from subdir' '
        rm -f actual &&
        echo grep.c >expect &&
 test_expect_success 'run from subdir' '
        rm -f actual &&
        echo grep.c >expect &&