android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop old git_require checks

Browse Source 
We've been requiring git-1.7.2 since Oct 2012, so we can safely drop
the individual checks sprinkled throughout the code base for older.

Change-Id: I1737fff7b3f27f475960b0bff9cb300aefd5d108
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253135
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger 2020-02-04 00:09:23 -05:00
parent 77479863da
commit 6f1c626a9b
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
project.py
View File

@ -3125,9 +3125,6 @@ class Project(object):
raise TypeError('%s() got an unexpected keyword argument %r' raise TypeError('%s() got an unexpected keyword argument %r'
% (name, k)) % (name, k))
if config is not None: if config is not None:
if not git_require((1, 7, 2)):
raise ValueError('cannot set config on command line for %s()'
% name)
for k, v in config.items(): for k, v in config.items():
cmdv.append('-c') cmdv.append('-c')
cmdv.append('%s=%s' % (k, v)) cmdv.append('%s=%s' % (k, v))

4
subcmds/grep.py
View File

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

3
subcmds/sync.py
View File

@ -580,8 +580,7 @@ later is required to fix a server side protocol bug.
project.config.SetString('gc.pruneExpire', 'never') project.config.SetString('gc.pruneExpire', 'never')
gc_gitdirs[project.gitdir] = project.bare_git gc_gitdirs[project.gitdir] = project.bare_git
has_dash_c = git_require((1, 7, 2)) if multiprocessing:
if multiprocessing and has_dash_c:
cpu_count = multiprocessing.cpu_count() cpu_count = multiprocessing.cpu_count()
else: else:
cpu_count = 1 cpu_count = 1