diff options
| -rw-r--r-- | project.py | 3 | ||||
| -rw-r--r-- | subcmds/grep.py | 4 | ||||
| -rw-r--r-- | subcmds/sync.py | 3 |
3 files changed, 3 insertions, 7 deletions
| @@ -3125,9 +3125,6 @@ class Project(object): | |||
| 3125 | raise TypeError('%s() got an unexpected keyword argument %r' | 3125 | raise TypeError('%s() got an unexpected keyword argument %r' |
| 3126 | % (name, k)) | 3126 | % (name, k)) |
| 3127 | if config is not None: | 3127 | if config is not None: |
| 3128 | if not git_require((1, 7, 2)): | ||
| 3129 | raise ValueError('cannot set config on command line for %s()' | ||
| 3130 | % name) | ||
| 3131 | for k, v in config.items(): | 3128 | for k, v in config.items(): |
| 3132 | cmdv.append('-c') | 3129 | cmdv.append('-c') |
| 3133 | cmdv.append('%s=%s' % (k, v)) | 3130 | cmdv.append('%s=%s' % (k, v)) |
diff --git a/subcmds/grep.py b/subcmds/grep.py index 13069286..89611cd6 100644 --- a/subcmds/grep.py +++ b/subcmds/grep.py | |||
| @@ -21,7 +21,7 @@ import sys | |||
| 21 | from color import Coloring | 21 | from color import Coloring |
| 22 | from command import PagedCommand | 22 | from command import PagedCommand |
| 23 | from error import GitError | 23 | from error import GitError |
| 24 | from git_command import git_require, GitCommand | 24 | from git_command import GitCommand |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | class GrepColoring(Coloring): | 27 | class GrepColoring(Coloring): |
| @@ -162,7 +162,7 @@ contain a line that matches both expressions: | |||
| 162 | out = GrepColoring(self.manifest.manifestProject.config) | 162 | out = GrepColoring(self.manifest.manifestProject.config) |
| 163 | 163 | ||
| 164 | cmd_argv = ['grep'] | 164 | cmd_argv = ['grep'] |
| 165 | if out.is_on and git_require((1, 6, 3)): | 165 | if out.is_on: |
| 166 | cmd_argv.append('--color') | 166 | cmd_argv.append('--color') |
| 167 | cmd_argv.extend(getattr(opt, 'cmd_argv', [])) | 167 | cmd_argv.extend(getattr(opt, 'cmd_argv', [])) |
| 168 | 168 | ||
diff --git a/subcmds/sync.py b/subcmds/sync.py index cc058af6..937d6e87 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -580,8 +580,7 @@ later is required to fix a server side protocol bug. | |||
| 580 | project.config.SetString('gc.pruneExpire', 'never') | 580 | project.config.SetString('gc.pruneExpire', 'never') |
| 581 | gc_gitdirs[project.gitdir] = project.bare_git | 581 | gc_gitdirs[project.gitdir] = project.bare_git |
| 582 | 582 | ||
| 583 | has_dash_c = git_require((1, 7, 2)) | 583 | if multiprocessing: |
| 584 | if multiprocessing and has_dash_c: | ||
| 585 | cpu_count = multiprocessing.cpu_count() | 584 | cpu_count = multiprocessing.cpu_count() |
| 586 | else: | 585 | else: |
| 587 | cpu_count = 1 | 586 | cpu_count = 1 |
