Merge pull request #172 from JakeGinnivan/MergeMessageBugFix

Fixed pull request can bump version

Author: andreasohlund

GitVersionCore/MergeMessageParser.cs

@@ -1,6 +1,7 @@
 namespace GitVersion
 {
     using System.Linq;
+    using System.Text.RegularExpressions;
     using LibGit2Sharp;
 
     class MergeMessageParser
@@ -33,6 +34,19 @@ public static bool TryParse(Commit mergeCommit, out string versionPart)
             {
                 trimmed = message.Replace("Merge branch 'release/", "");
             }
+            else if (Regex.IsMatch(message, "Merge pull request #\\d+ from "))
+            {
+                var branch = Regex.Match(message, "from (?<branch>.*)").Groups["branch"].Value;
+                var lastBranchPart = branch.Split('/', '-').Last();
+
+                if (!char.IsNumber(lastBranchPart.First()))
+                {
+                    return false;
+                }
+
+                versionPart = lastBranchPart;
+                return true;
+            }
             else if (message.StartsWith("Merge branch '"))
             {
                 trimmed = message.Replace("Merge branch '", "");

Tests/MergeMessageParserTests.cs

@@ -2,6 +2,7 @@
 using GitVersion;
 using LibGit2Sharp;
 using NUnit.Framework;
+using Shouldly;
 
 [TestFixture]
 public class MergeMessageParserTests
@@ -17,6 +18,7 @@ public class MergeMessageParserTests
     [TestCase("Merge branch 'hotfix-0.1.5'\n", true, "0.1.5")]
     [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")]
     public void AssertMergeMessage(string message, bool isMergeCommit, string expectedVersion)
     {
         var c = new MockCommit
@@ -30,12 +32,12 @@ public void AssertMergeMessage(string message, bool isMergeCommit, string expect
 
         if (expectedVersion == null)
         {
-            Assert.IsFalse(parsed);
+            parsed.ShouldBe(false);
         }
         else
         {
-            Assert.IsTrue(parsed);
-            Assert.AreEqual(expectedVersion, versionPart);
+            parsed.ShouldBe(true);
+            versionPart.ShouldBe(expectedVersion);
         }
     }
 }