Integrate code review comments of reviewer asbjornu.

Author: HHobeck

BREAKING_CHANGES.md

@@ -1,6 +1,9 @@
 ## Unreleased
 
 *   When using a commit message that matches **both** `*-version-bump-message` and `no-bump-message`, there is no increment for that commit. In other words, `no-bump-message` now takes precedence over `*-version-bump-message`.
+*   The fallback version strategy returns always 0.0.0 and is flagged with should increment true. This gives you the version 0.1.0 on develop branch (IncrementStrategy.Minor) and 0.0.1 on main branch (IncremetnStrategy.Patch).
+*   We have not one effected branch configuration we have one or more effected branch configurations. In case of inheriting from parent branches this gives you the possiblity to solve stupid edge cases.
+*   The current branch (child) inherits from source branch (parent branch) if the increment strategy is set to inherit. This is highly recursive and can be configured via the configuration file.
 
 ## v5.0.0
 

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

@@ -457,4 +457,111 @@ public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommi
         fixture.Repository.Branches.Remove(HotfixBranch);
         fixture.AssertFullSemver("1.2.0-alpha.19", config);
     }
+
+    [Test]
+    public void NextVersionShouldBeConsideredOnTheMainBranch()
+    {
+        using EmptyRepositoryFixture fixture = new("main");
+
+        var configurationBuilder = TestConfigurationBuilder.New;
+
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("0.0.1+1", configurationBuilder.Build());
+
+        configurationBuilder.WithNextVersion("1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0+1", configurationBuilder.Build());
+
+        fixture.MakeACommit();
+        configurationBuilder.WithNextVersion(null);
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("0.0.1+2", configurationBuilder.Build());
+
+        configurationBuilder.WithNextVersion("1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0+2", configurationBuilder.Build());
+    }
+
+    /// <summary>
+    /// Prevent decrementation of versions on the develop branch #3177
+    /// (see https://github.com/GitTools/GitVersion/discussions/3177)
+    /// </summary>
+    [Test]
+    public void PreventDecrementationOfVersionsOnTheMainBranch()
+    {
+        using EmptyRepositoryFixture fixture = new("develop");
+
+        var configurationBuilder = TestConfigurationBuilder.New;
+
+        fixture.MakeACommit();
+        configurationBuilder.WithNextVersion("1.0.0");
+
+        // now we are ready to start with the preparation of the 1.0.0 release
+        fixture.BranchTo("release/1.0.0");
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-beta.1+1", configurationBuilder.Build());
+
+        // now we makes changes on develop that may or may not end up in the 1.0.0 release
+        fixture.Checkout("develop");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.0", configurationBuilder.Build());
+
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.1", configurationBuilder.Build());
+
+        // now we do the actual release of beta 1
+        fixture.Checkout("release/1.0.0");
+        fixture.ApplyTag("1.0.0-beta.1");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-beta.1", configurationBuilder.Build());
+
+        // continue with more work on develop that may or may not end up in the 1.0.0 release
+        fixture.Checkout("develop");
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.2", configurationBuilder.Build());
+
+        fixture.MergeNoFF("release/1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.4", configurationBuilder.Build());
+
+        fixture.Repository.Branches.Remove("release/1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.4", configurationBuilder.Build());
+
+        fixture.Repository.Tags.Remove("1.0.0-beta.1");
+
+        // Merge from develop to main
+        fixture.BranchTo("main");
+
+        // ❔ expected: "0.0.1+4"
+        // This behavior needs to be changed for the git flow workflow using the track-merge-message or track-merge-target options.
+        // [Bug] track-merge-changes produces unexpected result when combining hotfix and support branches #3052
+        fixture.AssertFullSemver("1.0.0+4", configurationBuilder.Build());
+
+        configurationBuilder.WithNextVersion("1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0+4", configurationBuilder.Build());
+
+        // Mark this version as RTM
+        fixture.ApplyTag("1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0", configurationBuilder.Build());
+    }
 }

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

@@ -241,4 +241,143 @@ public void AreTagsNotAdheringToTagPrefixIgnored()
 
         fixture.AssertFullSemver("0.0.1+7", config);
     }
+
+    [Test]
+    public void NextVersionShouldBeConsideredOnTheDevelopmentBranch()
+    {
+        using EmptyRepositoryFixture fixture = new("develop");
+
+        var configurationBuilder = TestConfigurationBuilder.New;
+
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("0.1.0-alpha.1", configurationBuilder.Build());
+
+        configurationBuilder.WithNextVersion("1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-alpha.1", configurationBuilder.Build());
+
+        fixture.MakeACommit();
+        configurationBuilder.WithNextVersion(null);
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("0.1.0-alpha.2", configurationBuilder.Build());
+
+        configurationBuilder.WithNextVersion("1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-alpha.2", configurationBuilder.Build());
+    }
+
+    /// <summary>
+    /// Prevent decrementation of versions on the develop branch #3177
+    /// (see https://github.com/GitTools/GitVersion/discussions/3177)
+    /// </summary>
+    [Test]
+    public void PreventDecrementationOfVersionsOnTheDevelopmentBranch()
+    {
+        using EmptyRepositoryFixture fixture = new("develop");
+
+        var configurationBuilder = TestConfigurationBuilder.New;
+
+        configurationBuilder.WithNextVersion("1.0.0");
+        fixture.MakeACommit();
+
+        // now we are ready to start with the preparation of the 1.0.0 release
+        fixture.BranchTo("release/1.0.0");
+        fixture.Checkout("develop");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.0", configurationBuilder.Build());
+
+        fixture.Checkout("release/1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-beta.1+0", configurationBuilder.Build());
+
+        // make another commit on release/1.0.0 to prepare the actual beta1 release
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-beta.1+1", configurationBuilder.Build());
+
+        // now we makes changes on develop that may or may not end up in the 1.0.0 release
+        fixture.Checkout("develop");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.0", configurationBuilder.Build());
+
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.1", configurationBuilder.Build());
+
+        // now we do the actual release of beta 1
+        fixture.Checkout("release/1.0.0");
+        fixture.ApplyTag("1.0.0-beta.1");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-beta.1", configurationBuilder.Build());
+
+        // continue with more work on develop that may or may not end up in the 1.0.0 release
+        fixture.Checkout("develop");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.1", configurationBuilder.Build());
+
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.2", configurationBuilder.Build());
+
+        // now we decide that the new on develop should be part of the beta 2 release
+        // so we merge it into release/1.0.0 with --no-ff because it is a protected branch
+        // but we don't do the release of beta 2 just yet
+        fixture.Checkout("release/1.0.0");
+        fixture.MergeNoFF("develop");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-beta.2+2", configurationBuilder.Build());
+
+        fixture.Checkout("develop");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.0", configurationBuilder.Build());
+
+        fixture.Checkout("release/1.0.0");
+        fixture.ApplyTag("1.0.0-beta.2");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-beta.2", configurationBuilder.Build());
+
+        fixture.Checkout("develop");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.0", configurationBuilder.Build());
+
+        fixture.MergeNoFF("release/1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.3", configurationBuilder.Build());
+
+        fixture.Repository.Branches.Remove("release/1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.3", configurationBuilder.Build());
+
+        fixture.Repository.Tags.Remove("1.0.0-beta.1");
+        fixture.Repository.Tags.Remove("1.0.0-beta.2");
+
+        // ❔ expected: "1.0.0-alpha.3"
+        // This behavior needs to be changed for the git flow workflow using the track-merge-message or track-merge-target options.
+        // [Bug] track-merge-changes produces unexpected result when combining hotfix and support branches #3052
+        fixture.AssertFullSemver("1.1.0-alpha.3", configurationBuilder.Build());
+
+        configurationBuilder.WithNextVersion("1.1.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-alpha.3", configurationBuilder.Build());
+    }
 }