From 7feff791ea2ddd34b2f3753b5d3956a1f9abe73f Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Mon, 24 Aug 2020 11:21:31 +0200
Subject: [PATCH] fix: prepare for simple-git 2.19 (#7074)
Co-authored-by: Jamie Magee <JamieMagee@users.noreply.github.com>
---
lib/util/git/index.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts
index 12af27d96f..2734e00864 100644
--- a/lib/util/git/index.ts
+++ b/lib/util/git/index.ts
@@ -290,7 +290,7 @@ export async function createBranch(
await git.reset(ResetMode.HARD);
await git.raw(['clean', '-fd']);
await git.checkout(['-B', branchName, sha]);
- await git.push('origin', branchName, { '--force': true });
+ await git.push('origin', branchName, { '--force': null });
config.branchExists[branchName] = true;
config.branchIsModified[branchName] = false;
}
@@ -615,7 +615,7 @@ export async function commitFiles({
}
}
const commitRes = await git.commit(message, [], {
- '--no-verify': true,
+ '--no-verify': null,
});
const commit = commitRes?.commit || 'unknown';
if (!force && !(await hasDiff(`origin/${branchName}`))) {
@@ -626,9 +626,9 @@ export async function commitFiles({
return null;
}
await git.push('origin', `${branchName}:${branchName}`, {
- '--force': true,
- '-u': true,
- '--no-verify': true,
+ '--force': null,
+ '-u': null,
+ '--no-verify': null,
});
// Fetch it after create
const ref = `refs/heads/${branchName}:refs/remotes/origin/${branchName}`;
--
GitLab