Skip to content

Commit cbed74a

Browse files
Merge pull request #1899 from GitTools/pr/release-branch-should-not-patch
Change default increment strategy for release branches to None instead of Patch
2 parents ef652c1 + 3b10296 commit cbed74a

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ branches:
4141
release:
4242
mode: ContinuousDelivery
4343
tag: beta
44-
increment: Patch
44+
increment: None
4545
prevent-increment-of-merged-branch-version: true
4646
track-merge-target: false
4747
regex: ^releases?[/-]

src/GitVersionCore/Configuration/ConfigExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static void Reset(this Config config)
5050
{ "develop", "master", "support", "release" },
5151
defaultTag: "beta",
5252
defaultPreventIncrement: true,
53-
defaultIncrementStrategy: IncrementStrategy.Patch,
53+
defaultIncrementStrategy: IncrementStrategy.None,
5454
isReleaseBranch: true);
5555
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, Config.FeatureBranchKey), Config.FeatureBranchRegex,
5656
new List<string>

src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@ private class Versions
135135
{
136136
public SemanticVersion IncrementedVersion { get; set; }
137137
public BaseVersion Version { get; set; }
138+
139+
public override string ToString()
140+
{
141+
return $"{Version} | {IncrementedVersion}";
142+
}
138143
}
139144
}
140145
}

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ public VersionTaggedCommit(Commit commit, SemanticVersion semVer, string tag)
6969
Commit = commit;
7070
SemVer = semVer;
7171
}
72+
73+
public override string ToString()
74+
{
75+
return $"{Tag} | {Commit} | {SemVer}";
76+
}
7277
}
7378
}
7479
}

0 commit comments

Comments
 (0)