From ca540aed19bb89a4cd71de83ba123338e1e721f6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 10 Jul 2019 15:42:30 -0400 Subject: git_command: drop custom version helper Since ParseGitVersion can call `git --version` automatically, we don't need this duplicate version() helper anymore. The only other user is the `repo version` code, so convert that to version_tuple().full. Bug: https://crbug.com/gerrit/11144 Change-Id: I9d77822fc39f4ba28884d9183359169cabf5f17d Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/231055 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger --- git_command.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'git_command.py') diff --git a/git_command.py b/git_command.py index 1807b55e..54db4d16 100644 --- a/git_command.py +++ b/git_command.py @@ -80,22 +80,12 @@ def terminate_ssh_clients(): _git_version = None class _GitCall(object): - def version(self): - p = GitCommand(None, ['--version'], capture_stdout=True) - if p.Wait() == 0: - if hasattr(p.stdout, 'decode'): - return p.stdout.decode('utf-8') - else: - return p.stdout - return None - def version_tuple(self): global _git_version if _git_version is None: - ver_str = git.version() - _git_version = Wrapper().ParseGitVersion(ver_str) + _git_version = Wrapper().ParseGitVersion() if _git_version is None: - print('fatal: "%s" unsupported' % ver_str, file=sys.stderr) + print('fatal: unable to detect git version', file=sys.stderr) sys.exit(1) return _git_version -- cgit v1.2.3-54-g00ecf