From f9d1cade0804a36f40bd0afb327fe4aee4c69023 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Fri, 10 Nov 2023 10:26:25 +0100
Subject: [PATCH] fix(git): use semver and update simple-git import (#25684)
---
lib/util/git/index.ts | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts
index 8f45f1d233..92cce55b24 100644
--- a/lib/util/git/index.ts
+++ b/lib/util/git/index.ts
@@ -2,13 +2,13 @@ import URL from 'node:url';
import { setTimeout } from 'timers/promises';
import is from '@sindresorhus/is';
import fs from 'fs-extra';
-// TODO: check if bug is fixed (#22198)
-// eslint-disable-next-line import/no-named-as-default
-import simpleGit, {
+import semver from 'semver';
+import {
Options,
ResetMode,
SimpleGit,
TaskOptions,
+ simpleGit,
} from 'simple-git';
import upath from 'upath';
import { configFileNames } from '../../config/app-strings';
@@ -24,7 +24,6 @@ import {
TEMPORARY_ERROR,
} from '../../constants/error-messages';
import { logger } from '../../logger';
-import { api as semverCoerced } from '../../modules/versioning/semver-coerced';
import { ExternalHostError } from '../../types/errors/external-host-error';
import type { GitProtocol } from '../../types/git';
import { incLimitedValue } from '../../workers/global/limits';
@@ -182,13 +181,7 @@ export async function validateGitVersion(): Promise<boolean> {
return false;
}
// istanbul ignore if
- if (
- !(
- version &&
- (semverCoerced.equals(version, GIT_MINIMUM_VERSION) ||
- semverCoerced.isGreaterThan(version, GIT_MINIMUM_VERSION))
- )
- ) {
+ if (!(version && semver.gte(version, GIT_MINIMUM_VERSION))) {
logger.error(
{ detectedVersion: version, minimumVersion: GIT_MINIMUM_VERSION },
'Git version needs upgrading',
--
GitLab