force tryFetch (#1189)

peter-evans · Jun 3, 2022 · 923ad83 · 923ad83
1 parent f094b77
commit 923ad83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -62,7 +62,9 @@ exports.getWorkingBaseAndType = getWorkingBaseAndType;
 function tryFetch(git, remote, branch) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            yield git.fetch([`${branch}:refs/remotes/${remote}/${branch}`], remote);
+            yield git.fetch([`${branch}:refs/remotes/${remote}/${branch}`], remote, [
+                '--force'
+            ]);
             return true;
         }
         catch (_a) {

diff --git a/src/create-or-update-branch.ts b/src/create-or-update-branch.ts
@@ -33,7 +33,9 @@ export async function tryFetch(
   branch: string
 ): Promise<boolean> {
   try {
-    await git.fetch([`${branch}:refs/remotes/${remote}/${branch}`], remote)
+    await git.fetch([`${branch}:refs/remotes/${remote}/${branch}`], remote, [
+      '--force'
+    ])
     return true
   } catch {
     return false