summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--subcmds/grep.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/subcmds/grep.py b/subcmds/grep.py
index 950cc155..4f714271 100644
--- a/subcmds/grep.py
+++ b/subcmds/grep.py
@@ -17,7 +17,7 @@ import sys
17from optparse import SUPPRESS_HELP 17from optparse import SUPPRESS_HELP
18from color import Coloring 18from color import Coloring
19from command import PagedCommand 19from command import PagedCommand
20from git_command import GitCommand 20from git_command import git_require, GitCommand
21 21
22class GrepColoring(Coloring): 22class GrepColoring(Coloring):
23 def __init__(self, config): 23 def __init__(self, config):
@@ -158,7 +158,7 @@ contain a line that matches both expressions:
158 out = GrepColoring(self.manifest.manifestProject.config) 158 out = GrepColoring(self.manifest.manifestProject.config)
159 159
160 cmd_argv = ['grep'] 160 cmd_argv = ['grep']
161 if out.is_on: 161 if out.is_on and git_require((1,6,3)):
162 cmd_argv.append('--color') 162 cmd_argv.append('--color')
163 cmd_argv.extend(getattr(opt,'cmd_argv',[])) 163 cmd_argv.extend(getattr(opt,'cmd_argv',[]))
164 164