Given a develop branch with one commit merged to main when merged commit tagged as stable

Author: HHobeck

src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWithTrackMergeTargetWhenMergedCommitTaggedAsStable.cs renamed to src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable.cs

@@ -8,22 +8,22 @@ namespace GitVersion.Core.TrunkBased;
 internal partial class TrunkBasedScenariosWithAGitFlow
 {
     [Parallelizable(ParallelScope.All)]
-    public class GivenADevelopBranchWithOneCommitMergedToMainWithTrackMergeTargetWhenMergedCommitTaggedAsStable
+    public class GivenADevelopBranchWithOneCommitMergedToMainWhenMergedCommitTaggedAsStable
     {
         private EmptyRepositoryFixture? fixture;
 
         private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New.WithLabel(null)
             .WithVersioningMode(VersioningMode.TrunkBased)
             .WithBranch("main", _ => _.WithVersioningMode(VersioningMode.ManualDeployment))
-            .WithBranch("develop", _ => _.WithVersioningMode(VersioningMode.ManualDeployment).WithTrackMergeTarget(true));
+            .WithBranch("develop", _ => _.WithVersioningMode(VersioningMode.ManualDeployment));
 
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
             // * 55 minutes ago  (tag: 1.0.0, main)
             // |\
             // | * 56 minutes ago  (HEAD -> develop)
-            // |/  
+            // |/
             // * 58 minutes ago
 
             fixture = new EmptyRepositoryFixture("main");
@@ -58,11 +58,40 @@ public void OneTimeSetUp()
         [TestCase(IncrementStrategy.Major, IncrementStrategy.Patch, ExpectedResult = "1.0.1-alpha.1+0")]
         [TestCase(IncrementStrategy.Major, IncrementStrategy.Minor, ExpectedResult = "1.1.0-alpha.1+0")]
         [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, ExpectedResult = "2.0.0-alpha.1+0")]
-        public string GetVersion(IncrementStrategy incrementOnMain, IncrementStrategy increment)
+        public string GetVersionWithTrackMergeTargetOnDevelop(IncrementStrategy incrementOnMain, IncrementStrategy increment)
         {
             IGitVersionConfiguration trunkBased = TrunkBasedBuilder
                 .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null))
-                .WithBranch("develop", _ => _.WithIncrement(increment))
+                .WithBranch("develop", _ => _.WithIncrement(increment).WithTrackMergeTarget(true))
+                .Build();
+
+            return fixture!.GetVersion(trunkBased).FullSemVer;
+        }
+
+        [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "0.0.0-alpha.1+2")]
+        [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, ExpectedResult = "0.0.1-alpha.1+2")]
+        [TestCase(IncrementStrategy.None, IncrementStrategy.Minor, ExpectedResult = "0.1.0-alpha.1+2")]
+        [TestCase(IncrementStrategy.None, IncrementStrategy.Major, ExpectedResult = "1.0.0-alpha.1+2")]
+
+        [TestCase(IncrementStrategy.Patch, IncrementStrategy.None, ExpectedResult = "0.0.0-alpha.1+2")]
+        [TestCase(IncrementStrategy.Patch, IncrementStrategy.Patch, ExpectedResult = "0.0.1-alpha.1+2")]
+        [TestCase(IncrementStrategy.Patch, IncrementStrategy.Minor, ExpectedResult = "0.1.0-alpha.1+2")]
+        [TestCase(IncrementStrategy.Patch, IncrementStrategy.Major, ExpectedResult = "1.0.0-alpha.1+2")]
+
+        [TestCase(IncrementStrategy.Minor, IncrementStrategy.None, ExpectedResult = "0.0.0-alpha.1+2")]
+        [TestCase(IncrementStrategy.Minor, IncrementStrategy.Patch, ExpectedResult = "0.0.1-alpha.1+2")]
+        [TestCase(IncrementStrategy.Minor, IncrementStrategy.Minor, ExpectedResult = "0.1.0-alpha.1+2")]
+        [TestCase(IncrementStrategy.Minor, IncrementStrategy.Major, ExpectedResult = "1.0.0-alpha.1+2")]
+
+        [TestCase(IncrementStrategy.Major, IncrementStrategy.None, ExpectedResult = "0.0.0-alpha.1+2")]
+        [TestCase(IncrementStrategy.Major, IncrementStrategy.Patch, ExpectedResult = "0.0.1-alpha.1+2")]
+        [TestCase(IncrementStrategy.Major, IncrementStrategy.Minor, ExpectedResult = "0.1.0-alpha.1+2")]
+        [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, ExpectedResult = "1.0.0-alpha.1+2")]
+        public string GetVersionWithNoTrackMergeTargetOnDevelop(IncrementStrategy incrementOnMain, IncrementStrategy increment)
+        {
+            IGitVersionConfiguration trunkBased = TrunkBasedBuilder
+                .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null))
+                .WithBranch("develop", _ => _.WithIncrement(increment).WithTrackMergeTarget(false))
                 .Build();
 
             return fixture!.GetVersion(trunkBased).FullSemVer;