Feature branches now use the branch name as the pre-release tag

Author: Jake Ginnivan

AcceptanceTests/GitFlow/MetaDataByCommitFixture.cs

@@ -49,10 +49,10 @@ public void CanCorrectlyDetectCommitCountsAndReleaseDataWhenThatApplies()
                 EnsureMetaDataMatch(f, "hotfix-1.3.1", "1.3.1-beta.1+1", r => (Commit)r.Tags["1.3.0"].Target);
 
                 ResetToK(f.Repository);
-                EnsureMetaDataMatch(f, "feature", "1.4.0-unstable.0+2");
+                EnsureMetaDataMatch(f, "feature", "1.4.0-feature+2");
 
                 ResetToJ(f.Repository);
-                EnsureMetaDataMatch(f, "feature", "1.4.0-unstable.0+1");
+                EnsureMetaDataMatch(f, "feature", "1.4.0-feature+1");
 
                 ResetToI(f.Repository);
                 EnsureMetaDataMatch(f, "develop", "1.4.0.2-unstable");

GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs

@@ -28,7 +28,7 @@ protected SemanticVersion FindVersion(
                 Major = versionFromMaster.Major,
                 Minor = versionFromMaster.Minor + 1,
                 Patch = 0,
-                PreReleaseTag = "unstable0",
+                PreReleaseTag = context.CurrentBranch.Name,
                 BuildMetaData = new SemanticVersionBuildMetaData(
                     numberOfCommitsOnBranchSinceCommit,
                     context.CurrentBranch.Name, releaseDate)

Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_1_commit.approved.txt

@@ -3,8 +3,8 @@
     "Minor": 1,
     "Patch": 0,
     "PreReleaseTag": {
-        "Name": "unstable",
-        "Number": 0
+        "Name": "featureWithOneCommit",
+        "Number": null
     },
     "BuildMetaData": {
         "CommitsSinceTag": 1,

Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_2_commits.approved.txt

@@ -3,8 +3,8 @@
     "Minor": 1,
     "Patch": 0,
     "PreReleaseTag": {
-        "Name": "unstable",
-        "Number": 0
+        "Name": "featureWithOneCommit",
+        "Number": null
     },
     "BuildMetaData": {
         "CommitsSinceTag": 2,

Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_2_commits_but_building_an_commit.approved.txt

@@ -3,8 +3,8 @@
     "Minor": 1,
     "Patch": 0,
     "PreReleaseTag": {
-        "Name": "unstable",
-        "Number": 0
+        "Name": "featureWithOneCommit",
+        "Number": null
     },
     "BuildMetaData": {
         "CommitsSinceTag": 2,

Tests/GitFlow/GitVersionFinderTests.AFeatureBranchDoesNotRequireASpecificPrefix.approved.txt

@@ -3,8 +3,8 @@
     "Minor": 1,
     "Patch": 0,
     "PreReleaseTag": {
-        "Name": "unstable",
-        "Number": 0
+        "Name": "every-feature-is-welcome",
+        "Number": null
     },
     "BuildMetaData": {
         "CommitsSinceTag": 1,