From d8a8b790959e724d70a30227781efb5bb6745103 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 9 Nov 2019 08:58:52 -0500 Subject: [PATCH] Force Commit --- lib/git.js | 2 +- src/git.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git.js b/lib/git.js index 25632bd1..78b07af6 100644 --- a/lib/git.js +++ b/lib/git.js @@ -98,7 +98,7 @@ function deploy() { yield util_1.execute(`git add --all .`, temporaryDeploymentDirectory); yield util_1.execute(`git switch -c ${temporaryDeploymentBranch}`, temporaryDeploymentDirectory); yield util_1.execute(`git commit -m "Deploying to ${constants_1.action.branch} from ${constants_1.action.baseBranch} ${process.env.GITHUB_SHA}" --quiet`, temporaryDeploymentDirectory); - yield util_1.execute(`git push ${constants_1.repositoryPath} ${temporaryDeploymentBranch}:${constants_1.action.branch}`, temporaryDeploymentDirectory); + yield util_1.execute(`git push --force ${constants_1.repositoryPath} ${temporaryDeploymentBranch}:${constants_1.action.branch}`, temporaryDeploymentDirectory); return Promise.resolve("Commit step complete..."); }); } diff --git a/src/git.ts b/src/git.ts index ff7f1303..d3e06e97 100644 --- a/src/git.ts +++ b/src/git.ts @@ -100,7 +100,7 @@ export async function deploy(): Promise { temporaryDeploymentDirectory ); await execute( - `git push ${repositoryPath} ${temporaryDeploymentBranch}:${action.branch}`, + `git push --force ${repositoryPath} ${temporaryDeploymentBranch}:${action.branch}`, temporaryDeploymentDirectory );