Fix some unit tests

Author: HHobeck

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

@@ -60,7 +60,7 @@ public void CanTakeVersionFromHotfixesBranch()
 
         // create hotfix branch
         Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfixes/1.1.1"));
-        fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
+        fixture.AssertFullSemver("1.1.1+0");
         fixture.Repository.MakeACommit();
 
         fixture.AssertFullSemver("1.1.1-beta.1+1");
@@ -78,44 +78,44 @@ public void PatchOlderReleaseExample()
             r.MakeATaggedCommit("2.0.0");
         });
         // Merge hotfix branch to support
-        Commands.Checkout(fixture.Repository, MainBranch);
+        fixture.Checkout(MainBranch);
         var tag = fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0");
-        var supportBranch = fixture.Repository.CreateBranch("support-1.1", (LibGit2Sharp.Commit)tag.Target);
-        Commands.Checkout(fixture.Repository, supportBranch);
+        fixture.Repository.CreateBranch("support-1.1", (LibGit2Sharp.Commit)tag.Target);
+        fixture.Checkout("support-1.1");
         fixture.AssertFullSemver("1.1.0");
 
         // create hotfix branch
-        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix-1.1.1"));
-        fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
-        fixture.Repository.MakeACommit();
+        fixture.BranchTo("hotfix-1.1.1");
+        fixture.AssertFullSemver("1.1.1+0");
+        fixture.MakeACommit();
 
         fixture.AssertFullSemver("1.1.1-beta.1+1");
-        fixture.Repository.MakeACommit();
+        fixture.MakeACommit();
         fixture.AssertFullSemver("1.1.1-beta.1+2");
 
         // Create feature branch off hotfix branch and complete
-        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/fix"));
+        fixture.BranchTo("feature/fix");
         fixture.AssertFullSemver("1.1.1-fix.1+2");
-        fixture.Repository.MakeACommit();
+        fixture.MakeACommit();
         fixture.AssertFullSemver("1.1.1-fix.1+3");
 
         fixture.Repository.CreatePullRequestRef("feature/fix", "hotfix-1.1.1", prNumber: 8, normalise: true);
         fixture.AssertFullSemver("1.1.1-PullRequest8.4");
-        Commands.Checkout(fixture.Repository, "hotfix-1.1.1");
-        fixture.Repository.MergeNoFF("feature/fix", Generate.SignatureNow());
+        fixture.Checkout("hotfix-1.1.1");
+        fixture.MergeNoFF("feature/fix");
         fixture.AssertFullSemver("1.1.1-beta.1+4");
 
         // Merge hotfix into support branch to complete hotfix
-        Commands.Checkout(fixture.Repository, "support-1.1");
-        fixture.Repository.MergeNoFF("hotfix-1.1.1", Generate.SignatureNow());
+        fixture.Checkout("support-1.1");
+        fixture.MergeNoFF("hotfix-1.1.1");
         fixture.AssertFullSemver("1.1.1+5");
-        fixture.Repository.ApplyTag("1.1.1");
+        fixture.ApplyTag("1.1.1");
         fixture.AssertFullSemver("1.1.1");
 
         // Verify develop version
-        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Checkout("develop");
         fixture.AssertFullSemver("2.1.0-alpha.1");
-        fixture.Repository.MergeNoFF("support-1.1", Generate.SignatureNow());
+        fixture.MergeNoFF("support-1.1");
         fixture.AssertFullSemver("2.1.0-alpha.7");
     }
 
@@ -167,7 +167,7 @@ public void FeatureOnHotfixFeatureBranchDeleted()
         fixture.Checkout(hotfix451);
         fixture.MergeNoFF(featureBranch); // commit 2
         fixture.Repository.Branches.Remove(featureBranch);
-        fixture.AssertFullSemver("4.5.1-beta.2", configuration);
+        fixture.AssertFullSemver("4.5.1-beta.3", configuration);
     }
 
     /// <summary>
@@ -217,7 +217,8 @@ public void FeatureOnHotfixFeatureBranchNotDeleted()
         fixture.MakeACommit("blabla"); // commit 1
         fixture.Checkout(hotfix451);
         fixture.MergeNoFF(featureBranch); // commit 2
-        fixture.AssertFullSemver("4.5.1-beta.2", configuration);
+
+        fixture.AssertFullSemver("4.5.1-beta.3", configuration);
     }
 
     [Test]

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

@@ -12,41 +12,41 @@ public void SupportIsCalculatedCorrectly()
     {
         using var fixture = new EmptyRepositoryFixture();
         // Start at 1.0.0
-        fixture.Repository.MakeACommit();
-        fixture.Repository.ApplyTag("1.1.0");
+        fixture.MakeACommit();
+        fixture.ApplyTag("1.1.0");
 
         // Create 2.0.0 release
-        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release-2.0.0"));
+        fixture.BranchTo("release-2.0.0");
         fixture.Repository.MakeCommits(2);
 
         // Merge into develop and main
-        Commands.Checkout(fixture.Repository, MainBranch);
-        fixture.Repository.MergeNoFF("release-2.0.0");
-        fixture.Repository.ApplyTag("2.0.0");
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("release-2.0.0");
+        fixture.ApplyTag("2.0.0");
         fixture.AssertFullSemver("2.0.0");
 
         // Now lets support 1.x release
-        Commands.Checkout(fixture.Repository, "1.1.0");
-        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("support/1.0.0"));
+        fixture.Checkout("1.1.0");
+        fixture.BranchTo("support/1.0.0");
         fixture.AssertFullSemver("1.1.0");
 
         // Create release branch from support branch
-        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/1.2.0"));
-        fixture.Repository.MakeACommit();
+        fixture.BranchTo("release/1.2.0");
+        fixture.MakeACommit();
         fixture.AssertFullSemver("1.2.0-beta.1+1");
 
         // Create 1.2.0 release
-        Commands.Checkout(fixture.Repository, "support/1.0.0");
-        fixture.Repository.MergeNoFF("release/1.2.0");
+        fixture.Checkout("support/1.0.0");
+        fixture.MergeNoFF("release/1.2.0");
         fixture.AssertFullSemver("1.2.0+0");
-        fixture.Repository.ApplyTag("1.2.0");
+        fixture.ApplyTag("1.2.0");
 
         // Create 1.2.1 hotfix
-        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix/1.2.1"));
-        fixture.Repository.MakeACommit();
-        fixture.AssertFullSemver("1.2.1-beta.1+1");
-        Commands.Checkout(fixture.Repository, "support/1.0.0");
-        fixture.Repository.MergeNoFF("hotfix/1.2.1");
+        fixture.BranchTo("hotfix/1.2.1");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.2.1-beta.1+3");
+        fixture.Checkout("support/1.0.0");
+        fixture.MergeNoFF("hotfix/1.2.1");
         fixture.AssertFullSemver("1.2.1+2");
     }
 

src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
@@ -18,30 +19,38 @@ public VersionInBranchNameVersionStrategy(IRepositoryStore repositoryStore, Lazy
 
     public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfiguration configuration)
     {
-        if (!configuration.Value.IsReleaseBranch) yield break;
+        if (configuration.Value.IsReleaseBranch && TryGetBaseVersion(out var baseVersion, configuration))
+        {
+            yield return baseVersion;
+        }
+    }
 
+    private bool TryGetBaseVersion([NotNullWhen(true)] out BaseVersion? baseVersion, EffectiveBranchConfiguration configuration)
+    {
+        baseVersion = null;
+
+        Lazy<BranchCommit> commitBranchWasBranchedFrom = new(
+            () => this.repositoryStore.FindCommitBranchWasBranchedFrom(configuration.Branch, Context.Configuration)
+        );
         foreach (var branch in new[] { Context.CurrentBranch, configuration.Branch })
         {
             if (branch.Name.TryGetSemanticVersion(out var result, configuration.Value.VersionInBranchRegex,
                 configuration.Value.LabelPrefix, configuration.Value.SemanticVersionFormat))
             {
-                var commitBranchWasBranchedFrom = this.repositoryStore.FindCommitBranchWasBranchedFrom(
-                    configuration.Branch, Context.Configuration
-                );
-
                 string? branchNameOverride = null;
-                if (Context.CurrentBranch.Name.Equals(branch.Name)
-                    || Context.Configuration.GetBranchConfiguration(Context.CurrentBranch.Name).Label is null)
+                if (!result.Name.IsNullOrEmpty() && (Context.CurrentBranch.Name.Equals(branch.Name)
+                    || Context.Configuration.GetBranchConfiguration(Context.CurrentBranch.Name).Label is null))
                 {
                     branchNameOverride = result.Name;
                 }
 
-                yield return new BaseVersion(
-                    "Version in branch name", false, result.Value, commitBranchWasBranchedFrom.Commit, branchNameOverride
+                baseVersion = new BaseVersion(
+                    "Version in branch name", false, result.Value, commitBranchWasBranchedFrom.Value.Commit, branchNameOverride
                 );
-                yield break;
+                break;
             }
         }
 
+        return baseVersion != null;
     }
 }