rebase onboarding branch does not respect commitMessagePrefix

[tstollin]

How are you running Renovate?

• WhiteSource Renovate hosted app on github.com
• Self hosted (official docker image in on premise Kubernetes CronJob)

If using the hosted app, please skip to the next section.
Otherwise, if self-hosted, please complete the following:

Please select which platform you are using:

• Azure DevOps (dev.azure.com)
• Azure DevOps Server
• Bitbucket Cloud (bitbucket.org)
• Bitbucket Server
• Gitea
• github.com
• GitHub Enterprise Server
• gitlab.com
• GitLab self-hosted

Renovate version: 25.49.5 (official docker image)

Describe the bug
In our enterprise environment, we are required to prefix all commit messages with Jira Issue IDs. To pass this regex check, we use the configuration option commitMessagePrefix to add a placeholder issue to all commits.
This works fine for creating onboarding PRs and update PRs.

But for rebasing onboarding PRs the commitMessagePrefix is ignored and our renovate CronJob fails due to the push being blocked.

To test the behaviour we deactivated the check (which is no longterm solution due to it being a compliance requirement). This created these changes on the onboarding PR:

A solution should be for getCommitMessage(config: RenovateConfig) in rebase.ts

renovate/lib/workers/repository/onboarding/branch/rebase.ts

Lines 18 to 33 in 3a4e742

	function getCommitMessage(config: RenovateConfig): string {
	const configFile = defaultConfigFile(config);
	let commitMessage: string;
	// istanbul ignore if
	if (config.semanticCommits === 'enabled') {
	commitMessage = config.semanticCommitType;
	if (config.semanticCommitScope) {
	commitMessage += `(${config.semanticCommitScope})`;
	}
	commitMessage += ': ';
	commitMessage += 'add ' + configFile;
	} else {
	commitMessage = 'Add ' + configFile;
	}
	return commitMessage;
	}

to honour the config commitMessagePrefix just like create.ts does:

renovate/lib/workers/repository/onboarding/branch/create.ts

Lines 22 to 42 in 73cd3d5

	let commitMessagePrefix = '';
	if (config.commitMessagePrefix) {
	commitMessagePrefix = config.commitMessagePrefix;
	} else if (config.semanticCommits === 'enabled') {
	commitMessagePrefix = config.semanticCommitType;
	if (config.semanticCommitScope) {
	commitMessagePrefix += `(${config.semanticCommitScope})`;
	}
	}
	if (commitMessagePrefix) {
	commitMessagePrefix = formatCommitMessagePrefix(commitMessagePrefix);
	}
	let onboardingCommitMessage: string;
	if (config.onboardingCommitMessage) {
	onboardingCommitMessage = config.onboardingCommitMessage;
	} else {
	onboardingCommitMessage = `${
	commitMessagePrefix ? 'add' : 'Add'
	} ${configFile}`;
	}

...

Relevant debug logs

Click me to see logs

Copy/paste any log here, between the starting and ending backticks

Have you created a minimal reproduction repository?

Please read the minimal reproductions documentation to learn how to make a good minimal reproduction repository.

• I have provided a minimal reproduction repository
• I don't have time for that, but it happens in a public repository I have linked to
• I don't have time for that, and cannot share my private repository
• The nature of this bug means it's impossible to reproduce publicly

Additional context

...

[rarkins]

What does your exact bot config look like? (sanitized but not simplified)

[tstollin]

Sorry, i forgot to include it. It looks like this:

    {
      "dryRun" :            false,
      "endpoint":           "<private bitbucket server url>",
      "platform":           "bitbucket-server",
      "autodiscover":       false,
      "username":           "renovate",
      "gitAuthor":          "Renovate <internal renovate user mail>",
      "npmrc":              "registry=<private repository url>\n",
      "maven": {
        "enabled": true
      },
      "hostRules": [{
        "hostType": "maven",
        "baseUrl": "<private repository url>"
      }],
      "packageRules": [{
        "matchManagers": ["maven"],
        "registryUrls": ["<private registry url>"]
      }],
      "branchPrefix":       "versioncheck/",
      "commitMessagePrefix": "REPLACEME-666",
      "repositories": [
        <removed>
      ]
    }

[rarkins]

It seems like we should have a common function for determining the commit message for create and rebase/update.

[pret-a-porter]

@rarkins I will take this issue

[tstollin]

Thank you @pret-a-porter

[renovate-release]

🎉 This issue has been resolved in version 25.72.2 🎉

The release is available on:

• GitHub release
• 25.72.2

Your semantic-release bot 📦🚀