Skip to content

Commit d2288dc

Browse files
author
Chris Maffin
committed
Filter out merge messages that look like versions but aren't
Add more specific regex matching for possible version numbers in merge messages. Fixes #466 All existing Tests pass and I have added one test case to validate this change.
1 parent 24fa6b5 commit d2288dc

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ Another commit message
8080
Commit message including a IP-number https://10.50.1.1
8181
A commit message")]
8282
[TestCase(@"Merge branch 'release/Sprint_2.0_Holdings_Computed_Balances'")]
83+
[TestCase(@"Merge branch 'feature/fix-for-08.14-push'")]
8384
public void MergeMessagesThatsNotRelatedToGitVersion(string commitMessage)
8485
{
8586

GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs

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

45-
var possibleVersions = Regex.Matches(mergeCommit.Message, @"^.*?(-|-v|/|/v|'|Finish )(?<PossibleVersions>\d+\.\d+(\.*\d+)*)")
45+
//TODO: Make the version prefixes customizable
46+
var possibleVersions = Regex.Matches(mergeCommit.Message, @"^.*?(([rR]elease|[hH]otfix|[aA]lpha)-|-v|/|/v|'|Finish )(?<PossibleVersions>\d+\.\d+(\.*\d+)*)")
4647
.Cast<Match>()
4748
.Select(m => m.Groups["PossibleVersions"].Value);
4849

0 commit comments

Comments
 (0)