Merge pull request #467 from Sacrelicious/release/3.0.0

Filter out merge messages that look like versions but aren't

Author: JakeGinnivan

GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -80,6 +80,7 @@ Another commit message
   Commit message including a IP-number https://10.50.1.1
   A commit message")]
         [TestCase(@"Merge branch 'release/Sprint_2.0_Holdings_Computed_Balances'")]
+        [TestCase(@"Merge branch 'feature/fix-for-08.14-push'")]
         public void MergeMessagesThatsNotRelatedToGitVersion(string commitMessage)
         {
 

GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs

@@ -42,7 +42,8 @@ private static SemanticVersion Inner(Commit mergeCommit, EffectiveConfiguration
                 return null;
             }
 
-            var possibleVersions = Regex.Matches(mergeCommit.Message, @"^.*?(-|-v|/|/v|'|Finish )(?<PossibleVersions>\d+\.\d+(\.*\d+)*)")
+            //TODO: Make the version prefixes customizable
+            var possibleVersions = Regex.Matches(mergeCommit.Message, @"^.*?(([rR]elease|[hH]otfix|[aA]lpha)-|-v|/|/v|'|Finish )(?<PossibleVersions>\d+\.\d+(\.*\d+)*)")
                 .Cast<Match>()
                 .Select(m => m.Groups["PossibleVersions"].Value);