Skip to content

Commit

Permalink
fix: update tracking
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesIves committed Sep 29, 2024
1 parent 9bb8292 commit 6cf6f9c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion __tests__/git.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ describe('git', () => {
await deploy(action)

// Includes the call to generateWorktree
expect(execute).toHaveBeenCalledTimes(13)
expect(execute).toHaveBeenCalledTimes(14)
expect(rmRF).toHaveBeenCalledTimes(1)
})

Expand Down
3 changes: 1 addition & 2 deletions src/worktree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,15 @@ export async function generateWorktree(

try {
checkout = new GitCheckout(branchName, `origin/${action.branch}`)

await execute(
checkout.toString(),
`${action.workspace}/${worktreedir}`,
action.silent
)
} catch (error) {
info('Unable to track the origin branch…')
checkout = new GitCheckout(branchName)

checkout = new GitCheckout(branchName)
await execute(
checkout.toString(),
`${action.workspace}/${worktreedir}`,
Expand Down

0 comments on commit 6cf6f9c

Please sign in to comment.