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:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 23:07:18 +0400
committerJunio C Hamano <gitster@pobox.com>2010-07-15 23:07:18 +0400
commita7d7853463ae77fc3c8511283f5c896bee673b33 (patch)
treed9a04cf599c9ef510090509d72a49b76c77a7bd9 /builtin
parentcb597adb5cb989540ebd77afc9507cd24d6c70bd (diff)
parente7b082a4118d15e901f4f44b067394b314a0ae6a (diff)
Merge branch 'jn/grep-open'
* jn/grep-open: grep -O: Do not pass color sequences as filenames to pager
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 232cd1ce07..597f76bc42 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;