Failing test for broken inheritance after merges

Author: rcknight

GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using GitVersion;
 using LibGit2Sharp;
 using NUnit.Framework;
@@ -32,6 +33,36 @@ public void ShouldInheritIncrementCorrectlyWithMultiplePossibleParentsAndWeirdly
             fixture.AssertFullSemver("1.1.0-JIRA-124.1+2");
         }
     }
+    
+    [Test]
+    public void BranchCreatedAfterFastForwardMergeShouldInheritCorrectly()
+    {
+        var config = new Config();
+        config.Branches.Add("unstable", config.Branches["develop"]);
+
+        using (var fixture = new EmptyRepositoryFixture(config))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("unstable");
+            fixture.Repository.Checkout("unstable");
+
+            //Create an initial feature branch
+            var feature123 = fixture.Repository.CreateBranch("feature/JIRA-123");
+            fixture.Repository.Checkout("feature/JIRA-123");
+            fixture.Repository.MakeCommits(1);
+
+            //Merge it
+            fixture.Repository.Checkout("unstable");
+            fixture.Repository.Merge(feature123, new Signature("me", "[email protected]", DateTimeOffset.Now));
+
+            //Create a second feature branch
+            fixture.Repository.CreateBranch("feature/JIRA-124");
+            fixture.Repository.Checkout("feature/JIRA-124");
+            fixture.Repository.MakeCommits(1);
+
+            fixture.AssertFullSemver("1.1.0-JIRA-124.1+2");
+        }
+    }
 
     [Test]
     public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumberOffDevelop()