Add support branch GitFlow test

Author: JakeGinnivan

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -70,6 +70,7 @@
     <Compile Include="GitDirFinderTests.cs" />
     <Compile Include="Fixtures\BaseGitFlowRepositoryFixture.cs" />
     <Compile Include="IntegrationTests\GitFlow\DevelopScenarios.cs" />
+    <Compile Include="IntegrationTests\GitFlow\SupportBranchScenarios.cs" />
     <Compile Include="IntegrationTests\GitFlow\MetaDataByCommitScenarios.cs" />
     <Compile Include="IntegrationTests\GitFlow\PatchScenarios.cs" />
     <Compile Include="IntegrationTests\GitFlow\ReleaseBranchTests.cs" />

GitVersionCore.Tests/Helpers/GitHelper.cs

@@ -19,6 +19,11 @@ public static Commit MakeACommit(this IRepository repository, DateTimeOffset dat
         return repository.Commit("Test Commit", Constants.Signature(dateTimeOffset), Constants.Signature(dateTimeOffset));
     }
 
+    public static void MergeNoFF(this IRepository repository, string branch)
+    {
+        MergeNoFF(repository, branch, Constants.SignatureNow());
+    }
+
     public static void MergeNoFF(this IRepository repository, string branch, Signature sig)
     {
         repository.Merge(repository.FindBranch(branch), sig, new MergeOptions

GitVersionCore.Tests/IntegrationTests/GitFlow/SupportBranchScenarios.cs

@@ -0,0 +1,52 @@
+namespace GitVersionCore.Tests.IntegrationTests.GitFlow
+{
+    using LibGit2Sharp;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class SupportBranchScenarios
+    {
+        [Test]
+        public void SupportIsCalculatedCorrectly()
+        {
+            using (var fixture = new BaseGitFlowRepositoryFixture("1.1.0"))
+            {   
+                // Create 2.0.0 release
+                fixture.Repository.CreateBranch("release-2.0.0").Checkout();
+                fixture.Repository.MakeCommits(2);
+                
+                // Merge into develop and master
+                fixture.Repository.Checkout("master");
+                fixture.Repository.MergeNoFF("release-2.0.0");
+                fixture.Repository.ApplyTag("2.0.0");
+                fixture.Repository.Checkout("develop");
+                fixture.Repository.MergeNoFF("release-2.0.0");
+                fixture.AssertFullSemver("2.1.0-unstable.0+0");
+
+                // Now lets support 1.x release
+                fixture.Repository.Checkout("1.1.0");
+                fixture.Repository.CreateBranch("support/1.0.0").Checkout();
+                fixture.AssertFullSemver("1.1.0");
+
+                // Create release branch from support branch
+                fixture.Repository.CreateBranch("release/1.2.0").Checkout();
+                fixture.Repository.MakeACommit();
+                fixture.AssertFullSemver("1.2.0-beta.1+1");
+
+                // Create 1.2.0 release
+                fixture.Repository.Checkout("support/1.0.0");
+                fixture.Repository.MergeNoFF("release/1.2.0");
+                fixture.AssertFullSemver("1.2.0");
+                fixture.Repository.ApplyTag("1.2.0");
+
+                // Create 1.2.1 hotfix
+                fixture.Repository.CreateBranch("hotfix/1.2.1").Checkout();
+                fixture.Repository.MakeACommit();
+                fixture.AssertFullSemver("1.2.1-beta.1+3");
+                fixture.Repository.Checkout("support/1.0.0");
+                fixture.Repository.MergeNoFF("hotfix/1.2.1");
+                fixture.AssertFullSemver("1.2.1");
+            }
+        } 
+    }
+}

GitVersionCore/GitFlow/BranchFinders/HotfixVersionFinder.cs

@@ -39,6 +39,7 @@ static string GetSuffix(Branch branch)
         {
             return branch.Name.TrimStart("hotfix-").TrimStart("hotfix/");
         }
+
         void EnsureVersionIsValid(ShortVersion version, Branch branch)
         {
             if (version.Patch == 0)