fix: add the removeSourceBranch flag to merge requests to prevent duplicate branches

fix: make checkout message check for general

Author: HosseinAgha

src/gitUtils.ts

@@ -37,13 +37,16 @@ export const pushTags = async () => {
 }
 
 export const switchToMaybeExistingBranch = async (branch: string) => {
- const { stderr } = await execWithOutput('git', ['checkout', branch], {
+ const { stdout, stderr } = await execWithOutput('git', ['checkout', branch], {
  ignoreReturnCode: true,
  })
- const isCreatingBranch = !stderr
- .toString()
- .includes(`Switched to a new branch '${branch}'`)
- if (isCreatingBranch) {
+
+ const shouldCreateBranch = !(
+ stderr.toString().includes(`Switched to`) ||
+ stdout.toString().includes(`Switched to`)
+ )
+
+ if (shouldCreateBranch) {
  await exec('git', ['checkout', '-b', branch])
  }
 }

src/run.ts

@@ -298,12 +298,14 @@ ${
  finalMrTitle,
  {
  description: await mrBodyPromise,
+ removeSourceBranch: true,
  },
  )
  } else {
  await api.MergeRequests.edit(context.projectId, searchResult[0].iid, {
  title: finalMrTitle,
  description: await mrBodyPromise,
+ removeSourceBranch: true,
  })
  console.log('merge request found')
  }