Make sure to checout main branch when using cache (#15)

navikt · Feb 12, 2024 · 9f0a32e · 9f0a32e
1 parent a9ff540
commit 9f0a32e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/common/git.ts b/src/common/git.ts
@@ -49,9 +49,13 @@ export class Gitter {
         const repoClient = this.createRepoGitClient(repo)
 
         if (this.type === 'cache') {
-            repoClient.clean([CleanOptions.FORCE, CleanOptions.RECURSIVE]).reset(ResetMode.HARD, ['origin/HEAD']).pull({
-                '--rebase': null,
-            })
+            repoClient
+                .clean([CleanOptions.FORCE, CleanOptions.RECURSIVE])
+                .reset(ResetMode.HARD, ['origin/HEAD'])
+                .checkout(defaultBranch)
+                .pull({
+                    '--rebase': null,
+                })
         } else {
             try {
                 const currentBranch = await repoClient.revparse(['--abbrev-ref', 'HEAD'])