Fixed test

Author: JakeGinnivan

GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -238,8 +238,7 @@ public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
 
             //but keep working on the release
             fixture.Repository.Checkout("release-2.0.0");
-
-            fixture.AssertFullSemver("2.0.0-beta.2+3");
+            fixture.AssertFullSemver("2.0.0-beta.2+2");
         }
     }
 }

GitVersionCore/BranchConfigurationCalculator.cs

@@ -73,10 +73,10 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
             }
             excludedBranches.ToList().ForEach(excludedInheritBranches.Add);
 
-            var branchPoint = currentBranch.FindCommitBranchWasBranchedFrom(repository, onlyEvaluateTrackedBranches, excludedInheritBranches.ToArray());
+            var branchPoint = currentBranch.FindCommitBranchWasBranchedFrom(repository, excludedInheritBranches.ToArray());
 
             List<Branch> possibleParents;
-            if (branchPoint.Sha == currentCommit.Sha)
+            if (branchPoint == null)
             {
                 possibleParents = currentCommit.GetBranchesContainingCommit(repository, true).Except(excludedInheritBranches).ToList();
             }

GitVersionCore/LibGitExtensions.cs

@@ -24,12 +24,17 @@ public static Branch FindBranch(this IRepository repository, string branchName)
             return repository.Branches.FirstOrDefault(x => x.Name == "origin/" + branchName);
         }
 
-        public static Commit FindCommitBranchWasBranchedFrom(this Branch branch, IRepository repository, bool onlyTrackedBranches, params Branch[] excludedBranches)
+        public static Commit FindCommitBranchWasBranchedFrom(this Branch branch, IRepository repository, params Branch[] excludedBranches)
         {
             var otherBranches = repository.Branches.Where(b => !b.IsRemote).Except(excludedBranches).Except(new [] { branch });
             var mergeBases = otherBranches.Select(b =>
             {
-                var mergeBase = repository.Commits.FindMergeBase(b.Tip, branch.Tip);
+                var otherCommit = b.Tip;
+                if (b.Tip.Parents.Contains(branch.Tip))
+                {
+                    otherCommit = b.Tip.Parents.First();
+                }
+                var mergeBase = repository.Commits.FindMergeBase(otherCommit, branch.Tip);
                 return mergeBase;
             }).Where(b => b != null);
             return mergeBases.OrderByDescending(b => b.Committer.When).FirstOrDefault();

GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchBaseVersionStrategy.cs

@@ -9,7 +9,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
             var versionInBranch = GetVersionInBranch(context);
             if (versionInBranch != null)
             {
-                var commitBranchWasBranchedFrom = context.CurrentBranch.FindCommitBranchWasBranchedFrom(context.Repository, context.OnlyEvaluateTrackedBranches);
+                var commitBranchWasBranchedFrom = context.CurrentBranch.FindCommitBranchWasBranchedFrom(context.Repository);
                 var branchNameOverride = context.CurrentBranch.Name.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);
                 return new BaseVersion("Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom, branchNameOverride);
             }