Merge pull request #750 from JakeGinnivan/DoNotPickupMergeTargetInBranchName

Do not pick up version in merge target

Author: JakeGinnivan

src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -45,6 +45,7 @@ public void ShouldNotAllowIncrementOfVersion()
         [TestCase("Merge branch 'Hotfix/10.10.50'", true, "10.10.50")]
         [TestCase("Merge branch 'hotfix-0.1.5'", true, "0.1.5")]
         [TestCase("Merge branch 'hotfix-4.2.2' into support-4.2", true, "4.2.2")]
+        [TestCase("Merge branch 'somebranch' into release-3.0.0", true, null)]
         [TestCase("Merge branch 'hotfix-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]
         [TestCase("Merge branch 'alpha-0.1.5'", true, "0.1.5")]
         [TestCase("Merge pull request #165 from Particular/release-1.0.0", true, "1.0.0")]

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs

@@ -1,5 +1,6 @@
 namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text.RegularExpressions;
@@ -41,8 +42,13 @@ private static SemanticVersion Inner(Commit mergeCommit, EffectiveConfiguration
                 return null;
             }
 
+            var commitMessage = mergeCommit.Message;
+            var lastIndexOf = commitMessage.LastIndexOf("into", StringComparison.OrdinalIgnoreCase);
+            if (lastIndexOf != -1)
+                commitMessage = commitMessage.Substring(0, lastIndexOf);
+
             //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+)*)")
+            var possibleVersions = Regex.Matches(commitMessage, @"^.*?(([rR]elease|[hH]otfix|[aA]lpha)-|-v|/|/v|'|Finish )(?<PossibleVersions>(?<!://)\d+\.\d+(\.*\d+)*)")
                 .Cast<Match>()
                 .Select(m => m.Groups["PossibleVersions"].Value);