Skip to content

Commit 0e76113

Browse files
committed
Should filter excluding branches before we calculate merge base on them all..
1 parent 698515e commit 0e76113

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/GitVersionCore/GitRepoMetadataProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,7 @@ public BranchCommit FindCommitBranchWasBranchedFrom(Branch branch, params Branch
198198
return BranchCommit.Empty;
199199
}
200200

201-
var possibleBranches = GetMergeCommitsForBranch(branch)
202-
.ExcludingBranches(excludedBranches)
201+
var possibleBranches = GetMergeCommitsForBranch(branch, excludedBranches)
203202
.Where(b => !branch.IsSameBranch(b.Branch))
204203
.ToList();
205204

@@ -216,7 +215,7 @@ public BranchCommit FindCommitBranchWasBranchedFrom(Branch branch, params Branch
216215
}
217216
}
218217

219-
List<BranchCommit> GetMergeCommitsForBranch(Branch branch)
218+
List<BranchCommit> GetMergeCommitsForBranch(Branch branch, Branch[] excludedBranches)
220219
{
221220
if (mergeBaseCommitsCache.ContainsKey(branch))
222221
{
@@ -231,6 +230,7 @@ List<BranchCommit> GetMergeCommitsForBranch(Branch branch)
231230
? new [] { ".*" } // Match anything if we can't find a branch config
232231
: currentBranchConfig.SourceBranches.Select(sb => configuration.Branches[sb].Regex);
233232
var branchMergeBases = Repository.Branches
233+
.ExcludingBranches(excludedBranches)
234234
.Where(b =>
235235
{
236236
if (b == branch) return false;

0 commit comments

Comments
 (0)