Fix VersionInBranchNameVersionStrategy only considers the releae branch

Author: HHobeck

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

@@ -40,12 +40,29 @@ public void CanTakeVersionFromReleaseBranch()
         using var fixture = new EmptyRepositoryFixture();
 
         const string taggedVersion = "1.0.3";
-        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.MakeATaggedCommit(taggedVersion);
         fixture.Repository.MakeCommits(5);
-        fixture.Repository.CreateBranch("release/2.0.0-LTS");
-        Commands.Checkout(fixture.Repository, "release/2.0.0-LTS");
+        fixture.BranchTo("release/2.0.0-LTS");
+        fixture.MakeACommit();
+
+        fixture.AssertFullSemver("2.0.0-LTS.1+1", configuration);
+    }
+
+    [Test]
+    public void CanTakeVersionFromHotfixBranch()
+    {
+        var configuration = GitFlowConfigurationBuilder.New
+            .WithBranch("hotfix", _ => _.WithLabel("{BranchName}"))
+            .Build();
+
+        using var fixture = new EmptyRepositoryFixture();
+
+        const string taggedVersion = "1.0.3";
+        fixture.MakeATaggedCommit(taggedVersion);
+        fixture.BranchTo("hotfix/1.0.5-LTS");
+        fixture.MakeACommit();
 
-        fixture.AssertFullSemver("2.0.0-LTS.1+0", configuration);
+        fixture.AssertFullSemver("1.0.5-LTS.1+1", configuration);
     }
 
     [Test]

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -134,6 +134,7 @@ GitVersion.Configuration.EffectiveConfiguration.TrackMergeTarget.get -> bool
 GitVersion.Configuration.EffectiveConfiguration.TracksReleaseBranches.get -> bool
 GitVersion.Configuration.EffectiveConfiguration.UpdateBuildNumber.get -> bool
 GitVersion.Configuration.EffectiveConfiguration.VersionFilters.get -> System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.IVersionFilter!>!
+GitVersion.Configuration.EffectiveConfiguration.VersionInBranchRegex.get -> System.Text.RegularExpressions.Regex!
 GitVersion.Configuration.EffectiveConfiguration.VersioningMode.get -> GitVersion.VersionCalculation.VersioningMode
 GitVersion.Configuration.IBranchConfiguration
 GitVersion.Configuration.IBranchConfiguration.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode?
@@ -180,6 +181,8 @@ GitVersion.Configuration.IGitVersionConfiguration.NoBumpMessage.get -> string?
 GitVersion.Configuration.IGitVersionConfiguration.PatchVersionBumpMessage.get -> string?
 GitVersion.Configuration.IGitVersionConfiguration.SemanticVersionFormat.get -> GitVersion.SemanticVersionFormat
 GitVersion.Configuration.IGitVersionConfiguration.UpdateBuildNumber.get -> bool
+GitVersion.Configuration.IGitVersionConfiguration.VersionInBranchPattern.get -> string?
+GitVersion.Configuration.IGitVersionConfiguration.VersionInBranchRegex.get -> System.Text.RegularExpressions.Regex!
 GitVersion.Configuration.IGitVersionConfiguration.Workflow.get -> string?
 GitVersion.Configuration.IIgnoreConfiguration
 GitVersion.Configuration.IIgnoreConfiguration.Before.get -> System.DateTimeOffset?
@@ -554,6 +557,7 @@ GitVersion.OutputVariables.VersionVariablesJsonModel.WeightedPreReleaseNumber.ge
 GitVersion.OutputVariables.VersionVariablesJsonModel.WeightedPreReleaseNumber.set -> void
 GitVersion.OutputVariables.VersionVariablesJsonStringConverter
 GitVersion.OutputVariables.VersionVariablesJsonStringConverter.VersionVariablesJsonStringConverter() -> void
+GitVersion.ReferenceName.TryGetSemanticVersion(out (GitVersion.SemanticVersion! Value, string? Name) result, System.Text.RegularExpressions.Regex! versionPatternRegex, string? labelPrefix, GitVersion.SemanticVersionFormat format) -> bool
 GitVersion.RefSpecDirection
 GitVersion.RefSpecDirection.Fetch = 0 -> GitVersion.RefSpecDirection
 GitVersion.RefSpecDirection.Push = 1 -> GitVersion.RefSpecDirection

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

@@ -20,23 +20,28 @@ public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfigur
     {
         if (!configuration.Value.IsReleaseBranch) yield break;
 
-        if (configuration.Branch.Name.TryGetSemanticVersion(out var result, configuration.Value.VersionInBranchRegex,
-            configuration.Value.LabelPrefix, configuration.Value.SemanticVersionFormat))
+        foreach (var branch in new[] { Context.CurrentBranch, configuration.Branch })
         {
-            var commitBranchWasBranchedFrom = this.repositoryStore.FindCommitBranchWasBranchedFrom(
-                configuration.Branch, Context.Configuration
-            );
-
-            string? branchNameOverride = null;
-            if (Context.CurrentBranch.Name.Equals(configuration.Branch.Name)
-                || Context.Configuration.GetBranchConfiguration(Context.CurrentBranch.Name).Label is null)
+            if (branch.Name.TryGetSemanticVersion(out var result, configuration.Value.VersionInBranchRegex,
+                configuration.Value.LabelPrefix, configuration.Value.SemanticVersionFormat))
             {
-                branchNameOverride = result.Name;
-            }
+                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)
+                {
+                    branchNameOverride = result.Name;
+                }
 
-            yield return new BaseVersion(
-                "Version in branch name", false, result.Value, commitBranchWasBranchedFrom.Commit, branchNameOverride
-            );
+                yield return new BaseVersion(
+                    "Version in branch name", false, result.Value, commitBranchWasBranchedFrom.Commit, branchNameOverride
+                );
+                yield break;
+            }
         }
+
     }
 }