Testcase and fix for issue 1348

Author: Frode

src/GitVersionCore.Tests/IntegrationTests/BranchWithoutCommitScenario.cs

@@ -0,0 +1,39 @@
+using GitTools.Testing;
+using LibGit2Sharp;
+using NUnit.Framework;
+
+namespace GitVersionCore.Tests.IntegrationTests
+{
+    [TestFixture]
+    public class BranchWithoutCommitScenarios : TestBase
+    {
+        [Test]
+        public void CanTakeVersionFromReleaseBranch()
+        {
+            using var fixture = new EmptyRepositoryFixture();
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            var commit = fixture.Repository.MakeACommit();
+            fixture.Repository.CreateBranch("release-4.0.123");
+            fixture.Checkout(commit.Sha);
+
+            fixture.AssertFullSemver("4.0.123-beta.1+0", fixture.Repository, commit.Sha, false, "release-4.0.123");
+        }
+
+        [Test]
+        public void BranchVersionHavePrecedenceOverTagVersionIfVersionGreaterThanTag()
+        {
+            using var fixture = new EmptyRepositoryFixture();
+
+            fixture.Repository.MakeACommit();
+
+            fixture.Repository.CreateBranch("develop");
+            fixture.Checkout("develop");
+            fixture.MakeATaggedCommit("0.1.0-alpha.1"); // simulate merge from feature branch
+
+            fixture.Repository.CreateBranch("release/1.0");
+            fixture.Checkout("release/1.0");
+
+            fixture.AssertFullSemver("1.0.0-beta.1+0");
+        }
+    }
+}

src/GitVersionCore.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
+
 using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersion.VersioningModes;
 using GitVersion.Configuration;
@@ -28,7 +29,7 @@ public NextVersionCalculator(ILog log, IMetaDataCalculator metaDataCalculator, I
         public SemanticVersion FindVersion(GitVersionContext context)
         {
             SemanticVersion taggedSemanticVersion = null;
-            // If current commit is tagged, don't do anything except add build metadata
+
             if (context.IsCurrentCommitTagged)
             {
                 // Will always be 0, don't bother with the +0 on tags
@@ -62,11 +63,20 @@ public SemanticVersion FindVersion(GitVersionContext context)
                 UpdatePreReleaseTag(context, semver, baseVersion.BranchNameOverride);
             }
 
-
             if (taggedSemanticVersion != null)
             {
-                // set the commit count on the tagged ver
-                taggedSemanticVersion.BuildMetaData.CommitsSinceVersionSource = semver.BuildMetaData.CommitsSinceVersionSource;
+                // replace calculated version with tagged version only if tagged version greater or equal to calculated version
+                if (semver.Major > taggedSemanticVersion.Major ||
+                        (semver.Major == taggedSemanticVersion.Major && semver.Minor > taggedSemanticVersion.Minor) ||
+                        (semver.Major == taggedSemanticVersion.Major && semver.Minor == taggedSemanticVersion.Minor && semver.Patch > taggedSemanticVersion.Patch))
+                {
+                    taggedSemanticVersion = null;
+                }
+                else
+                {
+                    // set the commit count on the tagged ver
+                    taggedSemanticVersion.BuildMetaData.CommitsSinceVersionSource = semver.BuildMetaData.CommitsSinceVersionSource;
+                }
             }
 
             return taggedSemanticVersion ?? semver;