Fix integration test

Author: HHobeck

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

@@ -202,7 +202,7 @@ public void GitFlowMajorRelease()
         fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
 
         fixture.Checkout(MainBranch);
-        fixture.AssertFullSemver("2.0.0-4");
+        fixture.AssertFullSemver("2.0.0-0");
         fixture.ApplyTag("2.0.0");
         fixture.AssertFullSemver("2.0.0");
 
@@ -291,7 +291,7 @@ public void GitFlowSupportMinorRelease()
         fixture.MergeNoFF("release/1.4.0");
         fixture.SequenceDiagram.Destroy("release/1.4.0");
         fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/1.4.0");
-        fixture.AssertFullSemver("1.4.0-4");
+        fixture.AssertFullSemver("1.4.0-0");
         fixture.ApplyTag("1.4.0");
         fixture.AssertFullSemver("1.4.0");
         Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
@@ -392,7 +392,7 @@ public void GitHubFlowMajorRelease()
         fixture.SequenceDiagram.Destroy("release/2.0.0");
         fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
 
-        fixture.AssertFullSemver("2.0.0-4");
+        fixture.AssertFullSemver("2.0.0-0");
         fixture.ApplyTag("2.0.0");
         fixture.AssertFullSemver("2.0.0");
         fixture.MakeACommit();

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

@@ -93,4 +93,35 @@ public void TakeTheLatestCommitAsBaseVersion(bool mode)
         // ✅ succeeds as expected
         fixture.AssertFullSemver("1.0.0-1+1", configuration);
     }
+
+    [TestCase(false, "1.0.0-1+4")]
+    [TestCase(true, "1.0.0-1+2")]
+    public void TakeTheCommitBranchedFromAsBaseVersionWhenTracksReleaseBranchesIsTrue(
+        bool tracksReleaseBranches, string version)
+    {
+        var configuration = ConfigurationBuilder
+            .WithBranch("main", _ => _
+                .WithIncrement(IncrementStrategy.Major)
+                .WithTrackMergeTarget(false)
+                .WithTracksReleaseBranches(tracksReleaseBranches)
+            ).Build();
+
+        using EmptyRepositoryFixture fixture = new("main");
+
+        fixture.MakeACommit("A");
+        fixture.MakeACommit("B");
+        fixture.BranchTo("release/foo");
+        fixture.Checkout("main");
+        fixture.MakeACommit("C");
+        fixture.Checkout("release/foo");
+        fixture.MakeACommit("D");
+        fixture.ApplyTag("0.0.0");
+        fixture.Checkout("main");
+        fixture.MakeACommit("D");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver(version, configuration);
+
+        fixture.Repository.DumpGraph();
+    }
 }

src/GitVersion.Core/Core/EffectiveConfigurationExtensions.cs

@@ -16,7 +16,7 @@ public static TaggedSemanticVersions GetTaggedSemanticVersion(this EffectiveConf
             taggedSemanticVersion |= TaggedSemanticVersions.OfMergeTargets;
         }
 
-        if (effectiveConfiguration.TrackMergeTarget)
+        if (effectiveConfiguration.TracksReleaseBranches)
         {
             taggedSemanticVersion |= TaggedSemanticVersions.OfReleaseBranches;
         }

src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs

@@ -40,12 +40,15 @@ private IEnumerable<BaseVersion> GetBaseVersionsInternal(EffectiveBranchConfigur
         ).SelectMany(elements => elements).Distinct().ToArray();
 
         var label = configuration.Value.GetBranchSpecificLabel(Context.CurrentBranch.Name, null);
+        var semanticVersionsWithTag = taggedSemanticVersionService.GetTaggedSemanticVersions(
+            branch: Context.CurrentBranch,
+            configuration: Context.Configuration,
+            label: label,
+            notOlderThan: Context.CurrentCommit.When,
+            taggedSemanticVersion: configuration.Value.GetTaggedSemanticVersion()
+        ).SelectMany(elements => elements).Distinct().ToArray();
 
-        var maxTaggedSemanticVersion = taggedSemanticVersions
-            .Where(element => !element.Value.IsMatchForBranchSpecificLabel(label)).Max();
-
-        foreach (var semanticVersionWithTag
-            in taggedSemanticVersions.Where(element => element.Value.IsMatchForBranchSpecificLabel(label)))
+        foreach (var semanticVersionWithTag in semanticVersionsWithTag)
         {
             var baseVersionSource = semanticVersionWithTag.Tag.Commit;
             var increment = incrementStrategyFinder.DetermineIncrementedField(
@@ -62,8 +65,7 @@ in taggedSemanticVersions.Where(element => element.Value.IsMatchForBranchSpecifi
                 {
                     Increment = increment,
                     ForceIncrement = false,
-                    Label = label,
-                    AlternativeSemanticVersion = maxTaggedSemanticVersion?.Value
+                    Label = label
                 }
             };
         }