Ignore version numbers in branch names that are not release branches.

src/GitVersionCore.Tests/IntegrationTests/OtherBranchScenarios.cs

@@ -1,4 +1,4 @@
-using GitTools.Testing;
+using GitTools.Testing;
 using GitVersionCore.Tests;
 using LibGit2Sharp;
 using NUnit.Framework;
@@ -15,10 +15,10 @@ public void CanTakeVersionFromReleaseBranch()
             const string TaggedVersion = "1.0.3";
             fixture.Repository.MakeATaggedCommit(TaggedVersion);
             fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("alpha-2.0.0");
-            Commands.Checkout(fixture.Repository, "alpha-2.0.0");
+            fixture.Repository.CreateBranch("release/beta-2.0.0");
+            Commands.Checkout(fixture.Repository, "release/beta-2.0.0");
 
-            fixture.AssertFullSemver("2.0.0-alpha.1+0");
+            fixture.AssertFullSemver("2.0.0-beta.1+0");
         }
     }
 
@@ -57,4 +57,4 @@ public void ShouldNotGetVersionFromFeatureBranchIfNotMerged()
             version.SemVer.ShouldBe("1.0.0-alpha.1");
         }
     }
-}
+}

src/GitVersionCore.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs

@@ -0,0 +1,72 @@
+namespace GitVersionCore.Tests.IntegrationTests
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using GitTools.Testing;
+
+    using GitVersion;
+
+    using GitVersionCore.Tests;
+
+    using LibGit2Sharp;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class VersionInCurrentBranchNameScenarios : TestBase
+    {
+        [Test]
+        public void TakesVersionFromNameOfReleaseBranch()
+        {
+            using (var fixture = new BaseGitFlowRepositoryFixture("1.0.0"))
+            {
+                fixture.BranchTo("release/2.0.0");
+
+                fixture.AssertFullSemver("2.0.0-beta.1+0");
+            }
+        }
+
+        [Test]
+        public void DoesNotTakeVersionFromNameOfNonReleaseBranch()
+        {
+            using (var fixture = new BaseGitFlowRepositoryFixture("1.0.0"))
+            {
+                fixture.BranchTo("feature/upgrade-power-level-to-9000.0.1");
+
+                fixture.AssertFullSemver("1.1.0-upgrade-power-level-to-9000-0-1.1+1");
+            }
+        }
+
+        [Test]
+        public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
+        {
+            var config = new Config
+            {
+                Branches = new Dictionary<string, BranchConfig> { { "support", new BranchConfig { IsReleaseBranch = true } } }
+            };
+
+            using (var fixture = new BaseGitFlowRepositoryFixture("1.0.0"))
+            {
+                fixture.BranchTo("support/2.0.0");
+
+                fixture.AssertFullSemver(config, "2.0.0+1");
+            }
+        }
+
+        [Test]
+        public void TakesVersionFromNameOfRemoteReleaseBranch()
+        {
+            using (var fixture = new RemoteRepositoryFixture())
+            {
+                fixture.BranchTo("release/2.0.0");
+                fixture.MakeACommit();
+                Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, new string[0], new FetchOptions(), null);
+
+                fixture.LocalRepositoryFixture.Checkout("origin/release/2.0.0");
+
+                fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0-beta.1+1");
+            }
+        }
+    }
+}

src/GitVersionCore.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs

@@ -0,0 +1,84 @@
+namespace GitVersionCore.Tests.IntegrationTests
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using GitTools.Testing;
+
+    using GitVersion;
+
+    using GitVersionCore.Tests;
+
+    using LibGit2Sharp;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class VersionInMergedBranchNameScenarios : TestBase
+    {
+        [Test]
+        public void TakesVersionFromNameOfReleaseBranch()
+        {
+            using (var fixture = new BaseGitFlowRepositoryFixture("1.0.0"))
+            {
+                fixture.CreateAndMergeBranchIntoDevelop("release/2.0.0");
+
+                fixture.AssertFullSemver("2.1.0-alpha.2");
+            }
+        }
+
+        [Test]
+        public void DoesNotTakeVersionFromNameOfNonReleaseBranch()
+        {
+            using (var fixture = new BaseGitFlowRepositoryFixture("1.0.0"))
+            {
+                fixture.CreateAndMergeBranchIntoDevelop("pull-request/improved-by-upgrading-some-lib-to-4.5.6");
+                fixture.CreateAndMergeBranchIntoDevelop("hotfix/downgrade-some-lib-to-3.2.1-to-avoid-breaking-changes");
+
+                fixture.AssertFullSemver("1.1.0-alpha.5");
+            }
+        }
+
+        [Test]
+        public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
+        {
+            var config = new Config
+            {
+                Branches = new Dictionary<string, BranchConfig> { { "support", new BranchConfig { IsReleaseBranch = true } } }
+            };
+
+            using (var fixture = new BaseGitFlowRepositoryFixture("1.0.0"))
+            {
+                fixture.CreateAndMergeBranchIntoDevelop("support/2.0.0");
+
+                fixture.AssertFullSemver(config, "2.1.0-alpha.2");
+            }
+        }
+
+        [Test]
+        public void TakesVersionFromNameOfRemoteReleaseBranch()
+        {
+            using (var fixture = new RemoteRepositoryFixture())
+            {
+                fixture.BranchTo("release/2.0.0");
+                fixture.MakeACommit();
+                Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, new string[0], new FetchOptions(), null);
+
+                fixture.LocalRepositoryFixture.MergeNoFF("origin/release/2.0.0");
+
+                fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0+0");
+            }
+        }
+    }
+
+    internal static class BaseGitFlowRepositoryFixtureExtensions
+    {
+        public static void CreateAndMergeBranchIntoDevelop(this BaseGitFlowRepositoryFixture fixture, string branchName)
+        {
+            fixture.BranchTo(branchName);
+            fixture.MakeACommit();
+            fixture.Checkout("develop");
+            fixture.MergeNoFF(branchName);
+        }
+    }
+}

src/GitVersionCore.Tests/Mocks/MockNetwork.cs

@@ -0,0 +1,16 @@
+namespace GitVersionCore.Tests.Mocks
+{
+    using System.Collections.Generic;
+
+    using LibGit2Sharp;
+
+    public class MockNetwork : Network
+    {
+        public MockNetwork(IEnumerable<MockRemote> mockRemotes)
+        {
+            Remotes = new MockRemoteCollection(mockRemotes);
+        }
+
+        public override RemoteCollection Remotes { get; }
+    }
+}

src/GitVersionCore.Tests/Mocks/MockRemote.cs

@@ -0,0 +1,11 @@
+namespace GitVersionCore.Tests.Mocks
+{
+    using LibGit2Sharp;
+
+    public class MockRemote : Remote
+    {
+        public MockRemote(string name) => Name = name;
+
+        public override string Name { get; }
+    }
+}

src/GitVersionCore.Tests/Mocks/MockRemoteCollection.cs

@@ -0,0 +1,37 @@
+namespace GitVersionCore.Tests.Mocks
+{
+    using System.Collections;
+    using System.Collections.Generic;
+
+    using LibGit2Sharp;
+
+    public class MockRemoteCollection : RemoteCollection, ICollection<Remote>
+    {
+        public List<Remote> Remotes;
+
+        public MockRemoteCollection(IEnumerable<MockRemote> mockRemotes)
+        {
+            Remotes = new List<Remote>(mockRemotes);
+        }
+
+        public override IEnumerator<Remote> GetEnumerator() => Remotes.GetEnumerator();
+
+        IEnumerator<Remote> IEnumerable<Remote>.GetEnumerator() => GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public void Add(Remote item) => Remotes.Add(item);
+
+        public void Clear() => Remotes.Clear();
+
+        public bool Contains(Remote item) => Remotes.Contains(item);
+
+        public void CopyTo(Remote[] array, int arrayIndex) => Remotes.CopyTo(array, arrayIndex);
+
+        public bool Remove(Remote item) => Remotes.Remove(item);
+
+        public int Count => Remotes.Count;
+
+        public bool IsReadOnly => false;
+    }
+}

src/GitVersionCore.Tests/Mocks/MockRepository.cs

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