Skip to content

Commit 3cffd4a

Browse files
anobleJakeGinnivan
authored andcommitted
Improved merge branch discovery to find release branches that have a v in front of the number.
1 parent e71919d commit 3cffd4a

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ public void ShouldNotAllowIncrementOfVersion()
5454
[TestCase("Merge pull request #64 from arledesma/feature-VS2013_3rd_party_test_framework_support", true, null)]
5555
[TestCase("Finish Release-0.12.0", true, "0.12.0")] //Support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Release' branch
5656
[TestCase("Finish 0.14.1", true, "0.14.1")] //Support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Hotfix' branch
57+
[TestCase("Merge branch 'Release-v0.2.0'", true, "0.2.0")]
58+
[TestCase("Merge branch 'Release-v2.2'", true, "2.2.0")]
5759
public void AssertMergeMessage(string message, bool isMergeCommit, string expectedVersion)
5860
{
5961
var parents = GetParents(isMergeCommit);

GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private static SemanticVersion Inner(Commit mergeCommit, EffectiveConfiguration
4242
return null;
4343
}
4444

45-
var possibleVersions = Regex.Matches(mergeCommit.Message, @"^.*?(-|/|'|Finish )(?<PossibleVersions>\d+\.\d+\.\d+)")
45+
var possibleVersions = Regex.Matches(mergeCommit.Message, @"^.*?(-|-v|/|/v|'|Finish )(?<PossibleVersions>\d+\.\d+(\.*\d+)*)")
4646
.Cast<Match>()
4747
.Select(m => m.Groups["PossibleVersions"].Value);
4848

0 commit comments

Comments
 (0)