Merge pull request #4135 from vinnyrose/feature/underscore-label-fix

Replace underscores in branch specific labels
GitTools · Jul 31, 2024 · 0fd23d1 · 0fd23d1
2 parents 4edaa30 + 46b0027
commit 0fd23d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
@@ -185,6 +185,7 @@ public void CanUseBranchNameOffAReleaseBranch()
     [TestCase("alpha", "JIRA-123", "^features?[/-](?<BranchName>.+)", "alpha")]
     [TestCase($"alpha.{ConfigurationConstants.BranchNamePlaceholder}", "JIRA-123", "^features?[/-](?<BranchName>.+)", "alpha.JIRA-123")]
     [TestCase("{BranchName}-of-task-number-{TaskNumber}", "4711_this-is-a-feature", "^features?[/-](?<TaskNumber>\\d+)_(?<BranchName>.+)", "this-is-a-feature-of-task-number-4711")]
+    [TestCase("{BranchName}", "4711_this-is-a-feature", "^features?[/-](?<BranchName>.+)", "4711-this-is-a-feature")]
     public void ShouldUseConfiguredLabel(string label, string featureName, string regularExpression, string preReleaseLabelName)
     {
         var configuration = GitFlowConfigurationBuilder.New

diff --git a/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs b/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs
@@ -103,6 +103,8 @@ public static bool IsReleaseBranch(this IGitVersionConfiguration configuration,
                 {
                     label = label.Replace("{" + groupName + "}", match.Groups[groupName].Value);
                 }
+
+                label = label.Replace('_', '-');
             }
         }