Fixed #1046

Author: czesiu

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

@@ -225,7 +225,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");
         }
     }
 

src/GitVersionCore/GitRepoMetadataProvider.cs

@@ -143,13 +143,9 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
                             .Any(c => c.Parents.Contains(findMergeBase));
                         if (mergeBaseWasForwardMerge)
                         {
-                            var second = commitToFindCommonBase.Parents.First();
-                            var mergeBase = this.Repository.ObjectDatabase.FindMergeBase(commit, second);
-                            if (mergeBase == findMergeBase)
-                            {
-                                break;
-                            }
-                            findMergeBase = mergeBase;
+                            commitToFindCommonBase = commitToFindCommonBase.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);