fix(merge messages): Add support for merge remote tracking style merge messages

Author: Jake Ginnivan

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

@@ -58,6 +58,7 @@ public void ShouldNotAllowIncrementOfVersion()
         [TestCase("Finish 0.14.1", true, "0.14.1")] //Support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Hotfix' branch
         [TestCase("Merge branch 'Release-v0.2.0'", true, "0.2.0")]
         [TestCase("Merge branch 'Release-v2.2'", true, "2.2.0")]
+        [TestCase("Merge remote-tracking branch 'origin/release/0.8.0' into develop/master", true, "0.8.0")]
         public void AssertMergeMessage(string message, bool isMergeCommit, string expectedVersion)
         {
             var parents = GetParents(isMergeCommit);
@@ -121,6 +122,7 @@ static void AssertMergeMessage(string message, string expectedVersion, List<Comm
             }
             else
             {
+                baseVersion.ShouldNotBeNull();
                 baseVersion.SemanticVersion.ToString().ShouldBe(expectedVersion);
             }
         }

src/GitVersionCore/MergeMessage.cs

@@ -15,6 +15,10 @@ class MergeMessage
         static Regex smartGitMergeMessage = new Regex(
             @"^Finish (?<Branch>.*)",
             RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        static Regex parseRemoteTrackingMergeMessage = new Regex(
+            @"^Merge remote-tracking branch '(?<SourceBranch>.*)' into (?<TargetBranch>.*)",
+            RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
         private string mergeMessage;
         private Config config;
 
@@ -73,7 +77,14 @@ private string ParseBranch()
                     PullRequestNumber = pullNumber;
                 }
                 var from = match.Groups["Source"].Value;
-                // We could remove/separate the remote name at this point?
+                // TODO We could remove/separate the remote name at this point?
+                return from;
+            }
+
+            match = parseRemoteTrackingMergeMessage.Match(mergeMessage);
+            if (match.Success) {
+                var from = match.Groups["SourceBranch"].Value;
+                // TODO We could remove/separate the remote name at this point?
                 return from;
             }