Added test for issue #1046 & fix proposition

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

@@ -178,7 +178,7 @@ public void InheritVersionFromReleaseBranch()
             fixture.AssertFullSemver("2.1.0-alpha.4");
             fixture.BranchTo("feature/MyFeature");
             fixture.MakeACommit();
-            fixture.AssertFullSemver("2.1.0-MyFeature.1+3");
+            fixture.AssertFullSemver("2.1.0-MyFeature.1+5");
         }
     }
 }

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -229,7 +229,7 @@ public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
             Commands.Checkout(fixture.Repository, "develop");
             fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
 
-            fixture.AssertFullSemver("2.1.0-alpha.6");
+            fixture.AssertFullSemver("2.1.0-alpha.11");
         }
     }
 
@@ -333,6 +333,7 @@ public void HotfixOffReleaseBranchShouldNotResetCount()
             fixture.AssertFullSemver(config, "2.0.0-beta.7");
         }
     }
+
     [Test]
     public void MergeOnReleaseBranchShouldNotResetCount()
     {
@@ -366,6 +367,61 @@ public void MergeOnReleaseBranchShouldNotResetCount()
     }
 
     [Test]
+    public void CommitOnDevelop_AfterReleaseBranchMergeToDevelop_ShouldNotResetCount()
+    {
+        var config = new Config
+        {
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.Repository.MakeACommit("initial");
+            fixture.Repository.CreateBranch("develop");
+            Commands.Checkout(fixture.Repository, "develop");
+
+            // Create release from develop
+            fixture.Repository.CreateBranch("release-2.0.0");
+            Commands.Checkout(fixture.Repository, "release-2.0.0");
+            fixture.AssertFullSemver(config, "2.0.0-beta.0");
+
+            // Make some commits on release
+            fixture.Repository.MakeACommit("release 1");
+            fixture.Repository.MakeACommit("release 2");
+            fixture.AssertFullSemver(config, "2.0.0-beta.2");
+
+            // First merge release to develop
+            Commands.Checkout(fixture.Repository, "develop");
+            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+            // Make some new commit on release
+            Commands.Checkout(fixture.Repository, "release-2.0.0");
+            fixture.Repository.MakeACommit("release 3 - after first merge");
+            fixture.AssertFullSemver(config, "2.0.0-beta.3");
+
+            // Make new commit on develop
+            Commands.Checkout(fixture.Repository, "develop");
+            fixture.Repository.MakeACommit("develop after merge");
+
+            // Checkout to release (no new commits) 
+            Commands.Checkout(fixture.Repository, "release-2.0.0");
+            fixture.AssertFullSemver(config, "2.0.0-beta.3");
+
+            // Make some new commit on release
+            fixture.Repository.MakeACommit("release 4");
+            fixture.Repository.MakeACommit("release 5");
+            fixture.AssertFullSemver(config, "2.0.0-beta.5");
+
+            // Second merge release to develop
+            Commands.Checkout(fixture.Repository, "develop");
+            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+            // Checkout to release (no new commits) 
+            Commands.Checkout(fixture.Repository, "release-2.0.0");
+            fixture.AssertFullSemver(config, "2.0.0-beta.5");
+        }
+    }
+
     public void ReleaseBranchShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
     {
         using (var fixture = new EmptyRepositoryFixture())

src/GitVersionCore/GitRepoMetadataProvider.cs

@@ -133,26 +133,23 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
                 {
                     Logger.WriteInfo(string.Format("Found merge base of {0}", findMergeBase.Sha));
                     // We do not want to include merge base commits which got forward merged into the other branch
-                    bool mergeBaseWasForwardMerge;
+                    Commit mergeBaseAsForwardMerge;
                     do
                     {
                         // Now make sure that the merge base is not a forward merge
-                        mergeBaseWasForwardMerge = otherBranch.Commits
+                        mergeBaseAsForwardMerge = otherBranch.Commits
                             .SkipWhile(c => c != commitToFindCommonBase)
                             .TakeWhile(c => c != findMergeBase)
-                            .Any(c => c.Parents.Contains(findMergeBase));
-                        if (mergeBaseWasForwardMerge)
+                            .LastOrDefault(c => c.Parents.Contains(findMergeBase));
+
+                        if (mergeBaseAsForwardMerge != null)
                         {
-                            var second = commitToFindCommonBase.Parents.First();
-                            var mergeBase = this.Repository.ObjectDatabase.FindMergeBase(commit, second);
-                            if (mergeBase == findMergeBase)
-                            {
-                                break;
-                            }
-                            findMergeBase = mergeBase;
+                            commitToFindCommonBase = mergeBaseAsForwardMerge.Parents.First();
+                            findMergeBase = this.Repository.ObjectDatabase.FindMergeBase(commit, commitToFindCommonBase);
+
                             Logger.WriteInfo(string.Format("Merge base was due to a forward merge, next merge base is {0}", findMergeBase));
                         }
-                    } while (mergeBaseWasForwardMerge);
+                    } while (mergeBaseAsForwardMerge != null);
                 }
 
                 // Store in cache.