From bafb55dd993e58ead28189b3618fad269734c1ef Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 27 Apr 2021 16:14:57 +0200
Subject: [PATCH] fix: patch grouping when separateMinorPatch=false (#9746)

Closes #9744
---
 lib/workers/repository/updates/branch-name.spec.ts | 1 +
 lib/workers/repository/updates/branch-name.ts      | 2 +-
 lib/workers/repository/updates/generate.spec.ts    | 1 +
 lib/workers/repository/updates/generate.ts         | 5 ++++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/workers/repository/updates/branch-name.spec.ts b/lib/workers/repository/updates/branch-name.spec.ts
index 4b97be036b5b19..325a14c00fad2e 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 1c94ad2c3be8e1..78454f101fa263 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 50c947bd37d91d..dbdf36e46241fa 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 2b7fd67b5956b6..76c1963f31d536 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);