Change the logic inheriting BranchConfiguration from parent branch if the IncrementStrategy is set to Inherit

src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs

@@ -12,8 +12,26 @@ public class BaseGitFlowRepositoryFixture : EmptyRepositoryFixture
     ///
     /// Main will be tagged with the initial version before branching develop
     /// </summary>
-    public BaseGitFlowRepositoryFixture(string initialVersion) :
-        this(r => r.MakeATaggedCommit(initialVersion))
+    public BaseGitFlowRepositoryFixture(string initialVersion) : this(initialVersion, "main")
+    {
+    }
+
+    /// <summary>
+    /// Creates a repo with a develop branch off main which is a single commit ahead of main
+    ///
+    /// Main will be tagged with the initial version before branching develop
+    /// </summary>
+    public BaseGitFlowRepositoryFixture(string initialVersion, string branchName) :
+        this(r => r.MakeATaggedCommit(initialVersion), branchName)
+    {
+    }
+
+    /// <summary>
+    /// Creates a repo with a develop branch off main which is a single commit ahead of main
+    ///
+    /// The initial setup actions will be performed before branching develop
+    /// </summary>
+    public BaseGitFlowRepositoryFixture(Action<IRepository> initialMainAction) : this(initialMainAction, "main")
     {
     }
 
@@ -22,7 +40,8 @@ public BaseGitFlowRepositoryFixture(string initialVersion) :
     ///
     /// The initial setup actions will be performed before branching develop
     /// </summary>
-    public BaseGitFlowRepositoryFixture(Action<IRepository> initialMainAction) => SetupRepo(initialMainAction);
+    public BaseGitFlowRepositoryFixture(Action<IRepository> initialMainAction, string branchName) :
+        base(branchName) => SetupRepo(initialMainAction);
 
     private void SetupRepo(Action<IRepository> initialMainAction)
     {

src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs

@@ -4,13 +4,18 @@ namespace GitTools.Testing;
 
 public class EmptyRepositoryFixture : RepositoryFixtureBase
 {
-    public EmptyRepositoryFixture() : base(CreateNewRepository)
+    public EmptyRepositoryFixture() : this("main")
     {
     }
 
-    private static IRepository CreateNewRepository(string path)
+    public EmptyRepositoryFixture(string branchName)
+        : base(path => CreateNewRepository(path, branchName))
     {
-        Init(path);
+    }
+
+    private static IRepository CreateNewRepository(string path, string branchName)
+    {
+        Init(path, branchName);
         Console.WriteLine("Created git repository at '{0}'", path);
 
         return new Repository(path);

src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs

@@ -12,7 +12,12 @@ public class RemoteRepositoryFixture : RepositoryFixtureBase
     public RemoteRepositoryFixture(Func<string, IRepository> builder)
         : base(builder) => CreateLocalRepository();
 
-    public RemoteRepositoryFixture() : this(CreateNewRepository)
+    public RemoteRepositoryFixture() : this("main")
+    {
+    }
+
+    public RemoteRepositoryFixture(string branchName) :
+        this(path => CreateNewRepository(path, branchName))
     {
     }
 
@@ -21,9 +26,9 @@ public RemoteRepositoryFixture() : this(CreateNewRepository)
     /// </summary>
     public LocalRepositoryFixture LocalRepositoryFixture { get; private set; }
 
-    private static IRepository CreateNewRepository(string path)
+    private static IRepository CreateNewRepository(string path, string branchName)
     {
-        Init(path);
+        Init(path, branchName);
         Console.WriteLine("Created git repository at '{0}'", path);
 
         var repo = new Repository(path);

src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs

@@ -65,7 +65,7 @@ protected virtual void Dispose(bool disposing)
 
     public void Checkout(string branch) => Commands.Checkout(Repository, branch);
 
-    public static void Init(string path) => GitTestExtensions.ExecuteGitCmd($"init {path} -b main");
+    public static void Init(string path, string branchName) => GitTestExtensions.ExecuteGitCmd($"init {path} -b {branchName}");
 
     public void MakeATaggedCommit(string tag)
     {

src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs

@@ -37,7 +37,7 @@ public void BeingOnBuildServerWithOutputJsonDoesNotFail()
         var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: " /output json /output buildserver", environments: env);
 
         result.ExitCode.ShouldBe(0);
-        const string version = "0.1.0+4";
+        const string version = "0.0.1+5";
         result.Output.ShouldContain($"##teamcity[buildNumber '{version}']");
         result.OutputVariables.ShouldNotBeNull();
         result.OutputVariables.FullSemVer.ShouldBeEquivalentTo(version);
@@ -56,7 +56,7 @@ public void BeingOnBuildServerWithOutputJsonAndOutputFileDoesNotFail(string outp
         var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: $" /output json /output buildserver /output file /outputfile {outputFile}", environments: env);
 
         result.ExitCode.ShouldBe(0);
-        const string version = "0.1.0+4";
+        const string version = "0.0.1+5";
         result.Output.ShouldContain($"##teamcity[buildNumber '{version}']");
         result.OutputVariables.ShouldNotBeNull();
         result.OutputVariables.FullSemVer.ShouldBeEquivalentTo(version);

src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs

@@ -143,9 +143,9 @@ public async Task VerifyBitBucketPipelinesPullRequest(string pullRequestRef)
 
     private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pullRequestRef, Dictionary<string, string> env)
     {
-        using var fixture = new EmptyRepositoryFixture();
+        using var fixture = new EmptyRepositoryFixture("main");
         var remoteRepositoryPath = ExecutableHelper.GetTempPath();
-        RepositoryFixtureBase.Init(remoteRepositoryPath);
+        RepositoryFixtureBase.Init(remoteRepositoryPath, "main");
         using (var remoteRepository = new Repository(remoteRepositoryPath))
         {
             remoteRepository.Config.Set("user.name", "Test");

src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs

@@ -36,9 +36,9 @@ public async Task VerifyTagCheckoutOnGitHubActions()
 
     private static async Task VerifyTagCheckoutVersionIsCalculatedProperly(Dictionary<string, string> env)
     {
-        using var fixture = new EmptyRepositoryFixture();
+        using var fixture = new EmptyRepositoryFixture("main");
         var remoteRepositoryPath = ExecutableHelper.GetTempPath();
-        RepositoryFixtureBase.Init(remoteRepositoryPath);
+        RepositoryFixtureBase.Init(remoteRepositoryPath, "main");
         using (var remoteRepository = new Repository(remoteRepositoryPath))
         {
             remoteRepository.Config.Set("user.name", "Test");

src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -30,7 +30,7 @@ branches:
     tag: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
-    track-merge-target: false
+    track-merge-target: true
     regex: ^master$|^main$
     source-branches:
     - develop
@@ -112,7 +112,7 @@ branches:
     tag: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
-    track-merge-target: false
+    track-merge-target: true
     regex: ^support[/-]
     source-branches:
     - main

src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs

@@ -160,7 +160,7 @@ public void CacheFileExistsOnDisk()
         var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, this.log);
 
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
-        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
 
         this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
         versionVariables = gitVersionCalculator.CalculateVersionVariables();
@@ -215,7 +215,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
         var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, this.log);
 
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
-        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
 
         this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
 
@@ -229,7 +229,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
         gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
         versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
-        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
 
         var cachedDirectoryTimestampAfter = this.fileSystem.GetLastDirectoryWrite(cacheDirectory);
         cachedDirectoryTimestampAfter.ShouldBe(cacheDirectoryTimestamp, "Cache was updated when override config was set");
@@ -305,7 +305,7 @@ public void ConfigChangeInvalidatesCache()
         var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
-        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
         versionVariables.FileName.ShouldNotBeNullOrEmpty();
 
         this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
@@ -370,7 +370,7 @@ public void NoCacheBypassesCache()
 
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
-        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
         versionVariables.FileName.ShouldNotBeNullOrEmpty();
 
         this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
@@ -379,7 +379,7 @@ public void NoCacheBypassesCache()
 
         gitVersionOptions.Settings.NoCache = true;
         versionVariables = gitVersionCalculator.CalculateVersionVariables();
-        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
     }
 
     [Test]
@@ -398,15 +398,19 @@ public void WorkingDirectoryWithoutGit()
     [Test]
     public void WorkingDirectoryWithoutCommits()
     {
+        // Setup
         using var fixture = new EmptyRepositoryFixture();
 
         var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
         var exception = Assert.Throws<GitVersionException>(() =>
         {
+            // Execute
             var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
             gitVersionCalculator.CalculateVersionVariables();
         });
+
+        // Verify
         exception?.Message.ShouldContain("No commits found on the current branch.");
     }
 

src/GitVersion.Core.Tests/Helpers/ConfigBuilder.cs

@@ -0,0 +1,99 @@
+using GitVersion.Configuration;
+using GitVersion.Model.Configuration;
+using GitVersion.VersionCalculation;
+
+namespace GitVersion.Core.Tests.Helpers;
+
+public sealed class ConfigBuilder
+{
+    public static ConfigBuilder New => new();
+
+    private string? nextVerson;
+    private VersioningMode versioningMode;
+    private bool withoutAnyTrackMergeTargets;
+    private IDictionary<string, bool> trackMergeTargetsDictionary;
+    private IDictionary<string, bool> preventIncrementOfMergedBranchVersionDictionary;
+    private IgnoreConfig? ignoreConfig;
+
+    private ConfigBuilder()
+    {
+        withoutAnyTrackMergeTargets = false;
+        versioningMode = VersioningMode.ContinuousDelivery;
+        trackMergeTargetsDictionary = new Dictionary<string, bool>();
+        preventIncrementOfMergedBranchVersionDictionary = new Dictionary<string, bool>();
+    }
+
+    public ConfigBuilder WithNextVersion(string? value)
+    {
+        nextVerson = value;
+        return this;
+    }
+
+    public ConfigBuilder WithVersioningMode(VersioningMode value)
+    {
+        versioningMode = value;
+        return this;
+    }
+
+    public ConfigBuilder WithTrackMergeTarget(string branch, bool value)
+    {
+        trackMergeTargetsDictionary[branch] = value;
+        return this;
+    }
+
+    public ConfigBuilder WithoutAnyTrackMergeTargets()
+    {
+        withoutAnyTrackMergeTargets = true;
+        trackMergeTargetsDictionary.Clear();
+        return this;
+    }
+
+    public ConfigBuilder WithPreventIncrementOfMergedBranchVersion(string branch, bool value)
+    {
+        preventIncrementOfMergedBranchVersionDictionary[branch] = value;
+        return this;
+    }
+
+    public ConfigBuilder WithIgnoreConfig(IgnoreConfig value)
+    {
+        ignoreConfig = value;
+        return this;
+    }
+
+    public Config Build()
+    {
+        Config configuration = new()
+        {
+            NextVersion = nextVerson,
+            VersioningMode = versioningMode
+        };
+
+        if (ignoreConfig != null)
+        {
+            configuration.Ignore = ignoreConfig;
+        }
+
+        ConfigurationBuilder configurationBuilder = new();
+        configuration = configurationBuilder.Add(configuration).Build();
+
+        if (withoutAnyTrackMergeTargets)
+        {
+            foreach (var branchConfiguration in configuration.Branches.Values)
+            {
+                branchConfiguration.TrackMergeTarget = false;
+            }
+        }
+
+        foreach (var item in trackMergeTargetsDictionary)
+        {
+            configuration.Branches[item.Key].TrackMergeTarget = item.Value;
+        }
+
+        foreach (var item in preventIncrementOfMergedBranchVersionDictionary)
+        {
+            configuration.Branches[item.Key].PreventIncrementOfMergedBranchVersion = item.Value;
+        }
+
+        return configuration;
+    }
+}