Fix unit tests

Author: HHobeck

src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs

@@ -162,7 +162,7 @@ public void FeatureOnHotfixFeatureBranchDeleted()
         fixture.Checkout(hotfix451);
         fixture.MergeNoFF(featureBranch); // commit 2
         fixture.Repository.Branches.Remove(featureBranch);
-        fixture.AssertFullSemver("4.5.1-beta.1+3", configuration);
+        fixture.AssertFullSemver("4.5.1-beta.1+4", configuration);
     }
 
     /// <summary>
@@ -208,7 +208,7 @@ public void FeatureOnHotfixFeatureBranchNotDeleted()
         fixture.Checkout(hotfix451);
         fixture.MergeNoFF(featureBranch); // commit 2
 
-        fixture.AssertFullSemver("4.5.1-beta.1+3", configuration);
+        fixture.AssertFullSemver("4.5.1-beta.1+4", configuration);
     }
 
     [Test]

src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs

@@ -38,8 +38,8 @@ public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch()
         fixture.BranchTo("pull/2/merge");
         fixture.MergeNoFF("feature/foo");
 
-        // ❌ expected: "2.0.0-PullRequest2.2"
-        fixture.AssertFullSemver("1.1.0-PullRequest2.2", configuration);
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("2.0.0-PullRequest2.2", configuration);
 
         fixture.Checkout("main");
         fixture.Remove("pull/2/merge");

src/GitVersion.Core/Core/RepositoryStore.cs

@@ -106,14 +106,47 @@ public IEnumerable<IBranch> GetSourceBranches(IBranch branch, IGitVersionConfigu
             params IBranch[] excludedBranches)
         => GetSourceBranches(branch, configuration, (IEnumerable<IBranch>)excludedBranches);
 
-    public IEnumerable<IBranch> GetSourceBranches(IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches)
+    public IEnumerable<IBranch> GetSourceBranches(
+        IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches)
     {
         var returnedBranches = new HashSet<IBranch>();
 
         var referenceLookup = this.repository.Refs.ToLookup(r => r.TargetIdentifier);
 
-        foreach (var branchGrouping in FindCommitBranchesWasBranchedFrom(branch, configuration, excludedBranches)
-            .GroupBy(element => element.Commit, element => element.Branch))
+        var commitBranches = FindCommitBranchesWasBranchedFrom(branch, configuration, excludedBranches).ToHashSet();
+
+        var ignore = new HashSet<BranchCommit>();
+        foreach (var commitBranch in commitBranches)
+        {
+            foreach (var commit in branch.Commits.Where(element => element.When > commitBranch.Commit.When))
+            {
+                var parents = commit.Parents.ToArray();
+                if (parents.Length > 1 && parents.Any(element => element.Equals(commitBranch.Commit)))
+                {
+                    ignore.Add(commitBranch);
+                }
+            }
+        }
+
+        foreach (var item in commitBranches.Skip(1).Reverse())
+        {
+            if (ignore.Contains(item)) continue;
+
+            foreach (var commitBranche in commitBranches)
+            {
+                if (item.Commit.Equals(commitBranche.Commit)) break;
+
+                foreach (var commit in commitBranche.Branch.Commits.Where(element => element.When >= item.Commit.When))
+                {
+                    if (commit.Equals(item.Commit))
+                    {
+                        commitBranches.Remove(item);
+                    }
+                }
+            }
+        }
+
+        foreach (var branchGrouping in commitBranches.GroupBy(element => element.Commit, element => element.Branch))
         {
             bool referenceMatchFound = false;
             var referenceNames = referenceLookup[branchGrouping.Key.Sha].Select(element => element.Name).ToHashSet();
@@ -180,18 +213,10 @@ public IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branc
             if (branch.Tip == null)
             {
                 this.log.Warning($"{branch} has no tip.");
-                yield break;
+                return Enumerable.Empty<BranchCommit>();
             }
 
-            DateTimeOffset? when = null;
-            var branchCommits = new MergeCommitFinder(this, configuration, excludedBranches, this.log)
-                .FindMergeCommitsFor(branch).ToList();
-            foreach (var branchCommit in branchCommits)
-            {
-                if (when != null && branchCommit.Commit.When != when) break;
-                yield return branchCommit;
-                when = branchCommit.Commit.When;
-            }
+            return new MergeCommitFinder(this, configuration, excludedBranches, this.log).FindMergeCommitsFor(branch).ToList();
         }
     }