Branch/PR Errors After Branch/PRs Deleted

[sjiveson]

What would you like help with?

Other

How are you running Renovate?

Self-hosted

If you're self-hosting Renovate, tell us which platform (GitHub, GitLab, etc) and which version of Renovate.

GitLab

Please tell us more about your question or problem

While testing renovatebot against a Gitlab repository, a number of the branches and PRs it created were deleted. I'm now seeing issues where renovate bot will not create the branches and PRs it needs to. I've recreated the branches to see if that helped but it hasn't. It's almost as if renovatebot somehow knows they used to exist. Log excerpts below - after I recreated the branches. Thanks in advance.

Logs (if relevant)

Logs

branchExists=true (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: dependencyDashboardCheck=undefined (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: recreateClosed is true. No need to check for closed PR. (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: Checking if PR has been edited (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: branch.isModified(): using git to calculate (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: branch.isModified() = false (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: Checking schedule(at any time, null) (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: No schedule defined (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: Branch already exists (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: branch.isBehindBase(): using git to calculate (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: branch.isBehindBase(): false (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, baseBranch=main, branch=renovate/terraform-updates-combined)
       "branchName": "renovate/terraform-updates-combined"
DEBUG: Branch is up-to-date (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: isBranchConflicted(main, renovate/terraform-updates-combined) (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: branch.isConflicted(): using git to calculate (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: isBranchConflicted: cleanup error (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, baseBranch=main, branch=renovate/terraform-updates-combined)
       "err": {
         "task": {
           "commands": ["merge", "--abort"],
           "format": "utf-8",
           "parser": "[function]"
         },
         "message": "fatal: There is no merge to abort (MERGE_HEAD missing).\n",
         "stack": "Error: fatal: There is no merge to abort (MERGE_HEAD missing).\n\n    at Object.action (/usr/local/renovate/node_modules/.pnpm/simple-git@3.22.0/node_modules/simple-git/src/lib/plugins/error-detection.plugin.ts:42:29)\n    at PluginStore.exec (/usr/local/renovate/node_modules/.pnpm/simple-git@3.22.0/node_modules/simple-git/src/lib/plugins/plugin-store.ts:29:29)\n    at /usr/local/renovate/node_modules/.pnpm/simple-git@3.22.0/node_modules/simple-git/src/lib/runners/git-executor-chain.ts:127:42\n    at new Promise (<anonymous>)\n    at GitExecutorChain.handleTaskData (/usr/local/renovate/node_modules/.pnpm/simple-git@3.22.0/node_modules/simple-git/src/lib/runners/git-executor-chain.ts:124:14)\n    at GitExecutorChain.<anonymous> (/usr/local/renovate/node_modules/.pnpm/simple-git@3.22.0/node_modules/simple-git/src/lib/runners/git-executor-chain.ts:100:40)\n    at Generator.next (<anonymous>)\n    at fulfilled (/usr/local/renovate/node_modules/.pnpm/simple-git@3.22.0/node_modules/simple-git/dist/cjs/index.js:55:24)\n    at processTicksAndRejections (node:internal/process/task_queues:95:5)"
       }

DEBUG: branch.isConflicted(): false (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: Branch does not need rebasing (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: Using reuseExistingBranch: true (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: Setting current branch to main (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
DEBUG: latest commit (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, branch=renovate/terraform-updates-combined)
       "branchName": "main",
       "latestCommitDate": "2024-05-02T13:53:57+00:00"

DEBUG: Value is not updated (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build, packageFile=nomad-client-ss-build.tf, branch=renovate/terraform-updates-combined)
       "manager": "terraform",
       "expectedValue": "v10.53.5",
       "foundValue": "v10.53.0"

DEBUG: branches info extended (repository=acme/uc/platform/hcl2/terraform-stack-blah-ss-build)
       "branchesInformation": [
         {
           "branchName": "renovate/pin-dependencies",
           "prNo": null,
           "prTitle": "chore(deps): pin dependency acme/universal-credit/pipeline-tooling/components/fragments to 4a0c00f",
           "result": "error",
           "upgrades": [
             {
               "datasource": "gitlab-tags",
               "depName": "acme/universal-credit/pipeline-tooling/components/fragments",
               "displayPending": "",
               "fixedVersion": "v12.5.0",
               "currentVersion": "v12.5.0",
               "currentValue": "v12.5.0",
               "newValue": "v12.5.0",
               "packageFile": ".gitlab-ci.yml",
               "updateType": "pinDigest",
               "packageName": "acme/universal-credit/pipeline-tooling/components/fragments"
             }
           ]
         },
       {
           "branchName": "renovate/terraform-updates-combined",
           "prNo": null,
           "prTitle": "chore(deps): update terraform updates combined",
           "result": "error",

[rarkins]

Renovate looks for an exact match of branch name + MR title in closed MRs. If that's found, it assumes that you wanted to ignore that update and won't recreate it.

You can rename any such existing closed MRs and this bypass this check and you get fresh ones

[sjiveson]

Thanks Rhys. I had tried renaming MRs with no success, hence I deleted (not closed) them entirely so there are no MRs for renovate to match.

[rarkins]

In that case I don't understand what problem you're raising. There's only DEBUG messages in the log above. Are you worried about isBranchConflicted: cleanup error?

[sjiveson]

I am. Also, before manually creating the renovate/terraform-updates-combined branch which has led to this error, renovate would not create the branch itself.

[rarkins]

You don't need to worry about the debug message. But if you see errors creating branches, please capture that debug log as that's something we'd want to look into

[sjiveson]

I do as no MRs are being created. I will however deleted the manually created branches and post that output.

Scratch that, a change in the renovate config seems to have surprisingly resolved this. Thanks for your input.