Trim feature/ off the start of the tag name

Author: Jake Ginnivan

GitVersionCore/ExtensionMethods.cs

@@ -29,7 +29,7 @@ public static void AppendLineFormat(this StringBuilder stringBuilder, string for
 
         public static string TrimStart(this string value, string toTrim)
         {
-            if (!value.StartsWith(toTrim))
+            if (!value.StartsWith(toTrim, StringComparison.InvariantCultureIgnoreCase))
             {
                 return value;
             }

GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs

@@ -23,12 +23,15 @@ protected SemanticVersion FindVersion(
             var numberOfCommitsOnBranchSinceCommit = NumberOfCommitsOnBranchSinceCommit(context, ancestor);
             var sha = context.CurrentBranch.Tip.Sha;
             var releaseDate = ReleaseDateFinder.Execute(context.Repository, sha, 0);
+            var preReleaseTag = context.CurrentBranch.Name
+                .TrimStart(branchType.ToString() + '-')
+                .TrimStart(branchType.ToString() + '/');
             var semanticVersion = new SemanticVersion
             {
                 Major = versionFromMaster.Major,
                 Minor = versionFromMaster.Minor + 1,
                 Patch = 0,
-                PreReleaseTag = context.CurrentBranch.Name,
+                PreReleaseTag = preReleaseTag,
                 BuildMetaData = new SemanticVersionBuildMetaData(
                     numberOfCommitsOnBranchSinceCommit,
                     context.CurrentBranch.Name, releaseDate)

Tests/GitFlow/GitFlowVersionFinderTests.cs

@@ -147,6 +147,31 @@ public void AFeatureBranchDoesNotRequireASpecificPrefix()
         }
     }
 
+    [Test]
+    public void AFeatureBranchPrefixIsNotIncludedInTag()
+    {
+        var repoPath = Clone(ASBMTestRepoWorkingDirPath);
+        using (var repo = new Repository(repoPath))
+        {
+            repo.Branches["develop"].ForceCheckout();
+
+            const string branchName = "feature/ABC-1234_SomeDescription";
+            repo.Branches.Add(branchName, repo.Head.Tip).ForceCheckout();
+
+            AddOneCommitToHead(repo, "code");
+
+            var finder = new GitVersionFinder();
+
+            var versionAndBranch = finder.FindVersion(new GitVersionContext
+            {
+                Repository = repo,
+                CurrentBranch = repo.Head,
+            });
+
+            ObjectApprover.VerifyWithJson(versionAndBranch, Scrubbers.GuidAndDateScrubber);
+        }
+    }
+
     [Test]
     public void AReleaseBranchIsRequiredToBranchOffOfDevelopBranch()
     {

Tests/GitFlow/GitVersionFinderTests.AFeatureBranchPrefixIsNotIncludedInTag.approved.txt

@@ -0,0 +1,21 @@
+{
+    "Major": 1,
+    "Minor": 1,
+    "Patch": 0,
+    "PreReleaseTag": {
+        "Name": "ABC-1234_SomeDescription",
+        "Number": null
+    },
+    "BuildMetaData": {
+        "CommitsSinceTag": 1,
+        "Branch": "feature/ABC-1234_SomeDescription",
+        "ReleaseDate": {
+            "OriginalDate": "<date replaced>",
+            "OriginalCommitSha": "000000000000000000000000000000000000000",
+            "Date": "<date replaced>",
+            "CommitSha": "000000000000000000000000000000000000000"
+        },
+        "Sha": "000000000000000000000000000000000000000",
+        "OtherMetaData": null
+    }
+}