only consider origin a remote that can have release branches

Author: bert2

src/GitVersionCore.Tests/Mocks/MockNetwork.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-
 using LibGit2Sharp;
 
 public class MockRepository : IRepository
@@ -11,7 +10,6 @@ public MockRepository()
     {
         Tags = new MockTagCollection();
         Refs = new MockReferenceCollection();
-        Network = new MockNetwork(new[] { new MockRemote("origin") });
     }
 
     public void Dispose()

src/GitVersionCore.Tests/Mocks/MockRemote.cs

@@ -42,9 +42,6 @@ public void ShouldNotAllowIncrementOfVersion()
         [TestCase("Merge branch 'release-4.6.6' into support-4.6", true, "4.6.6")]
         [TestCase("Merge branch 'release-10.10.50'", true, "10.10.50")]
         [TestCase("Merge branch 'release-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]
-        [TestCase("Merge pull request #165 from Particular/release-1.0.0", true, "1.0.0")]
-        [TestCase("Merge pull request #165 in Particular/release-1.0.0", true, "1.0.0")]
-        [TestCase("Merge pull request #500 in FOO/bar from Particular/release-1.0.0 to develop)", true, "1.0.0")]
         [TestCase("Finish Release-0.12.0", true, "0.12.0")] //Support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Release' branch
         [TestCase("Merge branch 'Release-v0.2.0'", true, "0.2.0")]
         [TestCase("Merge branch 'Release-v2.2'", true, "2.2.0")]
@@ -97,6 +94,22 @@ public void ShouldNotTakeVersionFromMergeOfNonReleaseBranch(string message, bool
             AssertMergeMessage(message + "\n ", null, parents);
         }
 
+        [TestCase("Merge pull request #165 from Particular/release-1.0.0", true)]
+        [TestCase("Merge pull request #165 in Particular/release-1.0.0", true)]
+        [TestCase("Merge pull request #500 in FOO/bar from Particular/release-1.0.0 to develop)", true)]
+        public void ShouldNotTakeVersionFromMergeOfReleaseBranchWithRemoteOtherThanOrigin(string message, bool isMergeCommit)
+        {
+            var parents = GetParents(isMergeCommit);
+            AssertMergeMessage(message, null, parents);
+            AssertMergeMessage(message + " ", null, parents);
+            AssertMergeMessage(message + "\r ", null, parents);
+            AssertMergeMessage(message + "\r", null, parents);
+            AssertMergeMessage(message + "\r\n", null, parents);
+            AssertMergeMessage(message + "\r\n ", null, parents);
+            AssertMergeMessage(message + "\n", null, parents);
+            AssertMergeMessage(message + "\n ", null, parents);
+        }
+
         [TestCase(@"Merge pull request #1 in FOO/bar from feature/ISSUE-1 to develop
 
 * commit '38560a7eed06e8d3f3f1aaf091befcdf8bf50fea':

src/GitVersionCore.Tests/Mocks/MockRemoteCollection.cs

@@ -2,7 +2,6 @@ namespace GitVersion
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
     using System.Text;
     using System.Text.RegularExpressions;
 
@@ -39,18 +38,5 @@ public static T OnlyOrDefault<T>(this IEnumerable<T> source)
 
             return default(T);
         }
-
-        public static string AsBranchNameWithoutRemote(this string branchName, GitVersionContext context)
-        {
-            branchName = branchName.RegexReplace("^refs/remotes/", string.Empty, RegexOptions.IgnoreCase);
-
-            var remote = context.Repository.Network.Remotes
-                .Select(r => $"{r.Name}/")
-                .SingleOrDefault(r => branchName.StartsWith(r, StringComparison.OrdinalIgnoreCase));
-
-            return remote != null
-                ? branchName.RegexReplace($"^{remote}", string.Empty, RegexOptions.IgnoreCase)
-                : branchName;
-        }
     }
-}
+}

src/GitVersionCore.Tests/Mocks/MockRepository.cs

@@ -2,7 +2,7 @@ namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
     using System.Collections.Generic;
     using System.Linq;
-
+    using System.Text.RegularExpressions;
     using LibGit2Sharp;
 
     /// <summary>
@@ -21,7 +21,7 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
                 {
                     if (TryParse(c, context, out var mergeMessage) &&
                         mergeMessage.Version != null &&
-                        context.FullConfiguration.IsReleaseBranch(mergeMessage.MergedBranch.AsBranchNameWithoutRemote(context)))
+                        context.FullConfiguration.IsReleaseBranch(TrimRemote(mergeMessage.MergedBranch)))
                     {
                         var shouldIncrement = !context.Configuration.PreventIncrementForMergedBranchVersion;
                         return new[]
@@ -50,5 +50,9 @@ static MergeMessage Inner(Commit mergeCommit, GitVersionContext context)
             var mergeMessage = new MergeMessage(mergeCommit.Message, context.FullConfiguration);
             return mergeMessage;
         }
+
+        static string TrimRemote(string branchName) => branchName
+            .RegexReplace("^refs/remotes/", string.Empty, RegexOptions.IgnoreCase)
+            .RegexReplace("^origin/", string.Empty, RegexOptions.IgnoreCase);
     }
 }