Force checkout

Sauloxd · Sep 2, 2020 · 20553a8 · 20553a8
1 parent 01a7e16
commit 20553a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/action/dist/index.js b/packages/action/dist/index.js
@@ -10175,7 +10175,7 @@ async function onPrClose({
 }) {
   await retry(5)(async () => {
     await exec('git', ['fetch', 'origin', ghBranch]);
-    await exec('git', ['checkout', ghBranch]);
+    await exec('git', ['checkout', '-f', ghBranch]);
     await exec('git', ['reset', '--hard', 'origin/' + ghBranch]);
     await io.rmRF(pathByBranch);
     const manifest = removeApp({ manifest: getManifest(), branchName, slug });
@@ -10257,7 +10257,7 @@ async function otherEvents({
   await exec('mv', [distDir, '.tmp']);
 
   await exec('git', ['fetch', 'origin', ghBranch]);
-  await exec('git', ['checkout', ghBranch]);
+  await exec('git', ['checkout', '-f', ghBranch]);
 
   const manifest = replaceApp({
     manifest: getManifest(),
@@ -10273,7 +10273,7 @@ async function otherEvents({
   const retry5 = retry(5);
   await retry5(async () => {
     await exec('git', ['fetch', 'origin', ghBranch]);
-    await exec('git', ['checkout', ghBranch]);
+    await exec('git', ['checkout', '-f', ghBranch]);
     await exec('git', ['reset', '--hard', 'origin/' + ghBranch]);
     core.debug('Coping .tmp/. -> ' + pathByHeadCommit);
     await io.cp('.tmp/.', pathByHeadCommit, { recursive: true, force: true });

diff --git a/packages/action/src/on-pr-close.js b/packages/action/src/on-pr-close.js
@@ -18,7 +18,7 @@ async function onPrClose({
 }) {
   await retry(5)(async () => {
     await exec('git', ['fetch', 'origin', ghBranch]);
-    await exec('git', ['checkout', ghBranch]);
+    await exec('git', ['checkout', '-f', ghBranch]);
     await exec('git', ['reset', '--hard', 'origin/' + ghBranch]);
     await io.rmRF(pathByBranch);
     const manifest = removeApp({ manifest: getManifest(), branchName, slug });

diff --git a/packages/action/src/other-events.js b/packages/action/src/other-events.js
@@ -52,7 +52,7 @@ async function otherEvents({
   await exec('mv', [distDir, '.tmp']);
 
   await exec('git', ['fetch', 'origin', ghBranch]);
-  await exec('git', ['checkout', ghBranch]);
+  await exec('git', ['checkout', '-f', ghBranch]);
 
   const manifest = replaceApp({
     manifest: getManifest(),
@@ -68,7 +68,7 @@ async function otherEvents({
   const retry5 = retry(5);
   await retry5(async () => {
     await exec('git', ['fetch', 'origin', ghBranch]);
-    await exec('git', ['checkout', ghBranch]);
+    await exec('git', ['checkout', '-f', ghBranch]);
     await exec('git', ['reset', '--hard', 'origin/' + ghBranch]);
     core.debug('Coping .tmp/. -> ' + pathByHeadCommit);
     await io.cp('.tmp/.', pathByHeadCommit, { recursive: true, force: true });