From b4dc3b1950c27d039fa66624ba12912a39a65b51 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 15 Jun 2021 06:53:17 +0200
Subject: [PATCH] fix(git): remove remote reset before fetch
---
lib/util/git/index.ts | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts
index 8d9eddaf07..a3f2a9fc49 100644
--- a/lib/util/git/index.ts
+++ b/lib/util/git/index.ts
@@ -266,12 +266,8 @@ export async function syncGit(): Promise<void> {
try {
await git.raw(['remote', 'set-url', 'origin', config.url]);
await resetToBranch(await getDefaultBranch(git));
- await git.pull();
- // istanbul ignore if
- if (process.env.NODE_ENV !== 'test') {
- await git.raw(['config', '--unset-all', 'remote.origin.fetch']);
- }
const fetchStart = Date.now();
+ await git.pull();
await git.fetch(['--depth=10']);
config.currentBranch =
config.currentBranch || (await getDefaultBranch(git));
@@ -279,13 +275,13 @@ export async function syncGit(): Promise<void> {
await cleanLocalBranches();
await git.raw(['remote', 'prune', 'origin']);
const durationMs = Math.round(Date.now() - fetchStart);
- logger.debug({ durationMs }, 'git fetch completed');
+ logger.info({ durationMs }, 'git fetch completed');
clone = false;
} catch (err) /* istanbul ignore next */ {
if (err.message === REPOSITORY_EMPTY) {
throw err;
}
- logger.warn({ err }, 'git fetch error');
+ logger.info({ err }, 'git fetch error');
}
}
if (clone) {
--
GitLab