Merge pull request #4796 from HHobeck/hotfix/4795-reads-tag-from-other-branch

fix: tagged version from the main and release branch should be considered

Author: arturcic

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

@@ -554,4 +554,27 @@ public void PreventDecrementationOfVersionsOnTheMainBranch()
         // ✅ succeeds as expected
         fixture.AssertFullSemver("1.0.0", configurationBuilder.Build());
     }
+
+    /// <summary>
+    /// "track-merge-target: false" reads tag from other branch #4795
+    /// (see https://github.com/GitTools/GitVersion/issues/4795)
+    /// </summary>
+    [Test]
+    public void TaggedVersionFromTheMainBranchShouldBeConsideredEvenIfItIsNewer()
+    {
+        using var fixture = new EmptyRepositoryFixture("main");
+
+        var configurationBuilder = GitFlowConfigurationBuilder.New;
+
+        fixture.MakeATaggedCommit("1.1.1");
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+        fixture.MergeNoFF("main");
+        fixture.ApplyTag("9.9.9");
+        fixture.Checkout("develop");
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("9.10.0-alpha.1", configurationBuilder.Build());
+    }
 }

src/GitVersion.Core/Core/TaggedSemanticVersionService.cs

@@ -55,7 +55,7 @@ IEnumerable<IEnumerable<CommitSemanticVersion>> GetElements()
             {
                 yield return GetTaggedSemanticVersionsOfMainBranchesInternal(
                     configuration: configuration,
-                    notOlderThan: notOlderThan,
+                    notOlderThan: null,
                     label: label,
                     excludeBranches: branch
                 );
@@ -65,7 +65,7 @@ IEnumerable<IEnumerable<CommitSemanticVersion>> GetElements()
             {
                 yield return GetTaggedSemanticVersionsOfReleaseBranchesInternal(
                     configuration: configuration,
-                    notOlderThan: notOlderThan,
+                    notOlderThan: null,
                     label: label,
                     excludeBranches: branch
                 );