Merge pull request #1138 from LarsAndreasEk/unwanted-major-bump

Commit message counted twice?

Author: JakeGinnivan

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -1,4 +1,8 @@
-using GitTools.Testing;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using GitTools;
+using GitTools.Testing;
 using GitVersion;
 using GitVersionCore.Tests;
 using LibGit2Sharp;
@@ -360,4 +364,50 @@ public void MergeOnReleaseBranchShouldNotResetCount()
             fixture.AssertFullSemver(config, "2.0.0-beta.2");
         }
     }
+
+    [Test]
+    public void ReleaseBranchShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
+    {
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.Repository.MakeATaggedCommit("1.0");
+            fixture.Repository.MakeACommit("+semver:major");
+            fixture.Repository.MakeACommit();
+
+            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/2.0"));
+
+            fixture.AssertFullSemver("2.0.0-beta.1+2");
+        }
+    }
+
+    [Test]
+    public void ReleaseBranchWithACommitShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
+    {
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.Repository.MakeATaggedCommit("1.0");
+            fixture.Repository.MakeACommit("+semver:major");
+            fixture.Repository.MakeACommit();
+
+            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/2.0"));
+
+            fixture.Repository.MakeACommit();
+
+            fixture.AssertFullSemver("2.0.0-beta.1+3");
+        }
+    }
+
+    [Test]
+    public void ReleaseBranchedAtCommitWithSemverMessageShouldUseBranchNameVersion()
+    {
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.Repository.MakeATaggedCommit("1.0");
+            fixture.Repository.MakeACommit("+semver:major");
+
+            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/2.0"));
+
+            fixture.AssertFullSemver("2.0.0-beta.1+1");
+        }
+    }
 }

src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

@@ -51,7 +51,9 @@ public BaseVersion GetBaseVersion(GitVersionContext context)
                 BaseVersion baseVersionWithOldestSource;
                 if (matchingVersionsOnceIncremented.Any())
                 {
-                    baseVersionWithOldestSource = matchingVersionsOnceIncremented.Aggregate((v1, v2) => v1.Version.BaseVersionSource.Committer.When < v2.Version.BaseVersionSource.Committer.When ? v1 : v2).Version;
+                    var oldest = matchingVersionsOnceIncremented.Aggregate((v1, v2) => v1.Version.BaseVersionSource.Committer.When < v2.Version.BaseVersionSource.Committer.When ? v1 : v2);
+                    baseVersionWithOldestSource = oldest.Version;
+                    maxVersion = oldest;
                     Logger.WriteInfo(string.Format(
                         "Found multiple base versions which will produce the same SemVer ({0}), taking oldest source for commit counting ({1})",
                         maxVersion.IncrementedVersion,