From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
"Nazri Ramliy" <ayiehere@gmail.com>,
git@vger.kernel.org, johannes.schindelin@gmx.de
Subject: [PATCH v2] grep -O: Do not pass color sequences as filenames to pager
Date: Fri, 2 Jul 2010 21:55:06 -0500 [thread overview]
Message-ID: <20100703025506.GB20980@burratino> (raw)
In-Reply-To: <AANLkTilI0NZiDk3I850x28pr5I0sYRiPLW7HAST9sduU@mail.gmail.com>
From: Nazri Ramliy <ayiehere@gmail.com>
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>
---
Nazri Ramliy wrote:
> You'll have to set "color.grep.filename" too in order to break the two
> test cases.
Thanks.
builtin/grep.c | 1 +
t/t7811-grep-open.sh | 15 +++++++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 232cd1c..597f76b 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1001,6 +1001,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) {
+ opt.color = 0;
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 c110441..568a6f2 100755
--- 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_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 &&
--
1.7.1.1
next prev parent reply other threads:[~2010-07-03 2:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-02 10:02 [PATCH] Bugfix: grep: Do not colorize output when -O is set Nazri Ramliy
2010-07-02 16:19 ` René Scharfe
2010-07-06 19:38 ` Jonathan Nieder
2010-07-06 20:19 ` René Scharfe
2010-07-02 19:21 ` Jonathan Nieder
2010-07-03 1:20 ` Nazri Ramliy
2010-07-03 2:55 ` Jonathan Nieder [this message]
2010-07-03 7:59 ` Jakub Narebski
2010-07-06 20:04 ` [PATCH] t/README: document more test helpers Jonathan Nieder
2010-07-06 20:23 ` Ævar Arnfjörð Bjarmason
2010-07-07 4:25 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100703025506.GB20980@burratino \
--to=jrnieder@gmail.com \
--cc=ayiehere@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=rene.scharfe@lsrfire.ath.cx \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).