|
|
@@ -17,7 +17,7 @@ import sys
|
|
|
from optparse import SUPPRESS_HELP
|
|
|
from color import Coloring
|
|
|
from command import PagedCommand
|
|
|
-from git_command import GitCommand
|
|
|
+from git_command import git_require, GitCommand
|
|
|
|
|
|
class GrepColoring(Coloring):
|
|
|
def __init__(self, config):
|
|
|
@@ -158,7 +158,7 @@ contain a line that matches both expressions:
|
|
|
out = GrepColoring(self.manifest.manifestProject.config)
|
|
|
|
|
|
cmd_argv = ['grep']
|
|
|
- if out.is_on:
|
|
|
+ if out.is_on and git_require((1,6,3)):
|
|
|
cmd_argv.append('--color')
|
|
|
cmd_argv.extend(getattr(opt,'cmd_argv',[]))
|
|
|
|