refactor: simplify patch branch name

lib/config/definitions.js

@@ -545,9 +545,7 @@ const options = [
       'Configuration to apply when an update type is patch. Only applies if `separateMinorPatch` is set to true',
     stage: 'package',
     type: 'json',
-    default: {
-      branchTopic: '{{{depNameSanitized}}}-{{{newMajor}}}.{{{newMinor}}}.x',
-    },
+    default: {},
     cli: false,
     mergeable: true,
   },
@@ -702,7 +700,8 @@ const options = [
     name: 'branchTopic',
     description: 'Branch topic',
     type: 'string',
-    default: '{{{depNameSanitized}}}-{{{newMajor}}}.x',
+    default:
+      '{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x',
     cli: false,
   },
   {

test/workers/repository/updates/__snapshots__/flatten.spec.js.snap

@@ -9,7 +9,7 @@ Array [
     "automergeType": "pr",
     "branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}",
     "branchPrefix": "renovate/",
-    "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}.x",
+    "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x",
     "bumpVersion": null,
     "commitBody": null,
     "commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}",
@@ -82,7 +82,7 @@ Array [
     "automergeType": "pr",
     "branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}",
     "branchPrefix": "renovate/",
-    "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}.x",
+    "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x",
     "bumpVersion": null,
     "commitBody": null,
     "commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}",
@@ -226,7 +226,7 @@ Array [
     "automergeType": "pr",
     "branchName": "{{{branchPrefix}}}{{{managerBranchPrefix}}}{{{branchTopic}}}",
     "branchPrefix": "renovate/",
-    "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}.x",
+    "branchTopic": "{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x",
     "bumpVersion": null,
     "commitBody": null,
     "commitMessage": "{{{commitMessagePrefix}}} {{{commitMessageAction}}} {{{commitMessageTopic}}} {{{commitMessageExtra}}} {{{commitMessageSuffix}}}",