Skip to content

Commit 1749b04

Browse files
author
Mark Rydstrom
committed
Load commits for mainline processing with FirstParentOnly
This prevents us from picking up merges we don't care about
1 parent 9885b9a commit 1749b04

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion, GitVersionConte
9999
{
100100
IncludeReachableFrom = context.CurrentBranch,
101101
ExcludeReachableFrom = baseVersion.BaseVersionSource,
102-
SortBy = CommitSortStrategies.Reverse
102+
SortBy = CommitSortStrategies.Reverse,
103+
FirstParentOnly = true
103104
}).Where(c => c.Sha != baseVersion.BaseVersionSource.Sha).ToList();
105+
104106
var directCommits = new List<Commit>();
105107

106108
// Scans commit log in reverse, aggregating merge commits

0 commit comments

Comments
 (0)