Skip to content

Commit f39b551

Browse files
committed
Removing default values from hotfix branch configuration which should be inherited from parent.
1 parent 42da619 commit f39b551

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

docs/input/docs/reference/configuration.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,15 +331,13 @@ branches:
331331
mode: ContinuousDelivery
332332
tag: '{BranchName}'
333333
increment: Inherit
334-
prevent-increment-of-merged-branch-version: false
335334
source-branches: [ 'develop', 'main', 'release', 'feature', 'support', 'hotfix' ]
336335
pre-release-weight: 30000
337336
pull-request:
338337
regex: ^(pull|pull\-requests|pr)[/-]
339338
mode: ContinuousDelivery
340339
tag: PullRequest
341340
increment: Inherit
342-
prevent-increment-of-merged-branch-version: false
343341
tag-number-pattern: '[/-](?<number>\d+)[-/]'
344342
source-branches: [ 'develop', 'main', 'release', 'feature', 'support', 'hotfix' ]
345343
pre-release-weight: 30000
@@ -348,12 +346,7 @@ branches:
348346
mode: ContinuousDelivery
349347
tag: beta
350348
increment: Inherit
351-
prevent-increment-of-merged-branch-version: false
352-
track-merge-target: false
353349
source-branches: [ 'release', 'main', 'support', 'hotfix' ]
354-
tracks-release-branches: false
355-
is-release-branch: false
356-
is-mainline: false
357350
pre-release-weight: 30000
358351
support:
359352
regex: ^support[/-]

src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,12 @@ branches:
8383
mode: ContinuousDelivery
8484
tag: beta
8585
increment: Inherit
86-
prevent-increment-of-merged-branch-version: false
87-
track-merge-target: false
8886
regex: ^hotfix(es)?[/-]
8987
source-branches:
9088
- release
9189
- main
9290
- support
9391
- hotfix
94-
tracks-release-branches: false
95-
is-release-branch: false
96-
is-mainline: false
9792
pre-release-weight: 30000
9893
support:
9994
mode: ContinuousDelivery

src/GitVersion.Core.Tests/IntegrationTests/GitflowScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void GitflowComplexExample()
7070
fixture.Checkout(MainBranch);
7171
fixture.BranchTo(hotfixBranch);
7272
fixture.MakeACommit("added hotfix");
73-
fixture.AssertFullSemver("1.2.1-beta.1+7");
73+
fixture.AssertFullSemver("1.2.1-beta.1+1");
7474
fixture.Checkout(MainBranch);
7575
fixture.MergeNoFF(hotfixBranch);
7676
fixture.AssertFullSemver("1.2.1+2");

src/GitVersion.Core/Configuration/ConfigurationBuilder.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,6 @@ private static Config CreateDefaultConfiguration()
292292
Config.HotfixBranchKey
293293
},
294294
Tag = "beta",
295-
PreventIncrementOfMergedBranchVersion = false,
296-
TrackMergeTarget = false,
297-
TracksReleaseBranches = false,
298-
IsMainline = false,
299-
IsReleaseBranch = false,
300295
PreReleaseWeight = 30000
301296
});
302297

0 commit comments

Comments
 (0)