Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNazri Ramliy <ayiehere@gmail.com>2010-07-03 06:55:06 +0400
committerJunio C Hamano <gitster@pobox.com>2010-07-07 22:23:17 +0400
commite7b082a4118d15e901f4f44b067394b314a0ae6a (patch)
tree22810e66783e5de49f82b49e076852539ce13dd5 /builtin
parent0c72cead8435b2865efc884060bd0bd49313cbd5 (diff)
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/grep.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 4b8ddbe0d5..7a9427d357 100644
--- 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) {
+ opt.color = 0;
opt.name_only = 1;
opt.null_following_name = 1;
opt.output_priv = &path_list;