diff --git a/lib/workers/repository/updates/branch-name.spec.ts b/lib/workers/repository/updates/branch-name.spec.ts index 4b97be036b5b19026ce6593ce381380faed46b63..325a14c00fad2ed51a5e9647de57b169f9297730 100644 --- a/lib/workers/repository/updates/branch-name.spec.ts +++ b/lib/workers/repository/updates/branch-name.spec.ts @@ -67,6 +67,7 @@ describe(getName(), () => { groupSlug: 'some group slug', updateType: 'patch', separateMajorMinor: true, + separateMinorPatch: true, newMajor: 2, group: {}, }; diff --git a/lib/workers/repository/updates/branch-name.ts b/lib/workers/repository/updates/branch-name.ts index 1c94ad2c3be8e1dcbd4c1ff56751ad977b38c51f..78454f101fa26395ca05ce08cef2166d1e611564 100644 --- a/lib/workers/repository/updates/branch-name.ts +++ b/lib/workers/repository/updates/branch-name.ts @@ -41,7 +41,7 @@ export function generateBranchName(update: RenovateConfig): void { update.groupSlug = `major-${update.groupSlug}`; } } - if (update.updateType === 'patch') { + if (update.updateType === 'patch' && update.separateMinorPatch) { update.groupSlug = `patch-${update.groupSlug}`; } update.branchTopic = update.group.branchTopic || update.branchTopic; diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts index 50c947bd37d91d258f3875a39f4902869e144d4f..dbdf36e46241fab00030fdff931301ba60a12e6b 100644 --- a/lib/workers/repository/updates/generate.spec.ts +++ b/lib/workers/repository/updates/generate.spec.ts @@ -502,6 +502,7 @@ describe(getName(), () => { newValue: '0.6.0', isGroup: true, separateMajorMinor: true, + separateMinorPatch: true, updateType: 'patch' as UpdateType, fileReplacePosition: 0, }, diff --git a/lib/workers/repository/updates/generate.ts b/lib/workers/repository/updates/generate.ts index 2b7fd67b5956b65e3c53e3c991665a5dc0b8f2bb..76c1963f31d5362e5449bcbc94aac54b244afd86 100644 --- a/lib/workers/repository/updates/generate.ts +++ b/lib/workers/repository/updates/generate.ts @@ -221,7 +221,10 @@ export function generateBranchConfig( upgrade.updateType === 'minor' && upgrade.separateMinorPatch ? ' (minor)' : ''; - upgrade.prTitle += upgrade.updateType === 'patch' ? ' (patch)' : ''; + upgrade.prTitle += + upgrade.updateType === 'patch' && upgrade.separateMinorPatch + ? ' (patch)' + : ''; } // Compile again to allow for nested templates upgrade.prTitle = template.compile(upgrade.prTitle, upgrade);