Merge pull request #3224 from enriqueraso/bug/resolving-semver-fail-with-an-empty-tag-in-a-configuration-branch

Fix issue with empty prerelease tags.

Author: asbjornu

src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs

@@ -71,4 +71,31 @@ public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed
 
         fixture.AssertFullSemver("1.3.1+2");
     }
+
+    [Test]
+    public void WhenSupportIsBranchedFromMainWithSpecificTag()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("0.1.0+0");
+
+        fixture.Repository.ApplyTag("1.4.0-rc");
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("support/1");
+        Commands.Checkout(fixture.Repository, "support/1");
+        fixture.AssertFullSemver("1.4.0+1");
+    }
+
+    [Test]
+    public void WhenSupportIsBranchedFromMainWithSpecificTagOnCommit()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("0.1.0+0");
+
+        fixture.Repository.ApplyTag("1.4.0-rc");
+        fixture.Repository.CreateBranch("support/1");
+        Commands.Checkout(fixture.Repository, "support/1");
+        fixture.AssertFullSemver("1.4.0");
+    }
 }

src/GitVersion.Core/Extensions/StringExtensions.cs

@@ -102,4 +102,6 @@ public static bool IsEquivalentTo(this string self, string? other) =>
 
     /// <inheritdoc cref="string.IsNullOrWhiteSpace"/>
     public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value) => string.IsNullOrWhiteSpace(value);
+
+    public static bool IsEmpty([NotNullWhen(false)] this string? value) => string.Empty.Equals(value);
 }

src/GitVersion.Core/PublicAPI.Shipped.txt

@@ -1325,6 +1325,7 @@ static GitVersion.Extensions.StringExtensions.IsHelp(this string! singleArgument
 static GitVersion.Extensions.StringExtensions.IsInit(this string! singleArgument) -> bool
 static GitVersion.Extensions.StringExtensions.IsNullOrEmpty(this string? value) -> bool
 static GitVersion.Extensions.StringExtensions.IsNullOrWhiteSpace(this string? value) -> bool
+static GitVersion.Extensions.StringExtensions.IsEmpty(this string? value) -> bool
 static GitVersion.Extensions.StringExtensions.IsSwitch(this string? value, string! switchName) -> bool
 static GitVersion.Extensions.StringExtensions.IsSwitchArgument(this string? value) -> bool
 static GitVersion.Extensions.StringExtensions.IsTrue(this string? value) -> bool

src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs

@@ -76,8 +76,12 @@ public NextVersion FindVersion()
         var hasPreReleaseTag = semver.PreReleaseTag?.HasTag() == true;
         var tag = configuration.Value.Tag;
         var branchConfigHasPreReleaseTagConfigured = !tag.IsNullOrEmpty();
-        var preReleaseTagDoesNotMatchConfiguration = hasPreReleaseTag && branchConfigHasPreReleaseTagConfigured && semver.PreReleaseTag?.Name != tag;
-        if (semver.PreReleaseTag?.HasTag() != true && branchConfigHasPreReleaseTagConfigured || preReleaseTagDoesNotMatchConfiguration)
+        var branchConfigIsMainlineAndHasEmptyPreReleaseTagConfigured = configuration.Value.IsMainline && tag.IsEmpty();
+        var preReleaseTagDoesNotMatchConfiguration = hasPreReleaseTag
+                                                     && (branchConfigHasPreReleaseTagConfigured || branchConfigIsMainlineAndHasEmptyPreReleaseTagConfigured)
+                                                     && semver.PreReleaseTag?.Name != tag;
+        var preReleaseTagOnlyInBranchConfig = !hasPreReleaseTag && branchConfigHasPreReleaseTagConfigured;
+        if (preReleaseTagOnlyInBranchConfig || preReleaseTagDoesNotMatchConfiguration)
         {
             UpdatePreReleaseTag(configuration.Value, semver, baseVersion.BranchNameOverride);
         }
@@ -93,6 +97,12 @@ public NextVersion FindVersion()
             {
                 // set the commit count on the tagged ver
                 taggedSemanticVersion.BuildMetaData.CommitsSinceVersionSource = semver.BuildMetaData?.CommitsSinceVersionSource;
+
+                // set the updated prerelease tag when it doesn't match with prerelease tag defined in branch configuration
+                if (preReleaseTagDoesNotMatchConfiguration)
+                {
+                    taggedSemanticVersion.PreReleaseTag = semver.PreReleaseTag;
+                }
             }
         }
 
@@ -112,6 +122,12 @@ private void UpdatePreReleaseTag(EffectiveConfiguration configuration, SemanticV
     {
         var tagToUse = configuration.GetBranchSpecificTag(this.log, Context.CurrentBranch.Name.Friendly, branchNameOverride);
 
+        if (configuration.IsMainline && tagToUse.IsEmpty())
+        {
+            semanticVersion.PreReleaseTag = new SemanticVersionPreReleaseTag(tagToUse, null);
+            return;
+        }
+
         long? number = null;
 
         var lastTag = this.repositoryStore