Skip to content

System.InvalidOperationException: Sequence contains no elements exception fixed #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 27, 2020
Merged

System.InvalidOperationException: Sequence contains no elements exception fixed #2437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7d0523
System.InvalidOperationException: Sequence contains no elements excep…
Oct 27, 2020
5a12d26
Test case added for System.InvalidOperationException: Sequence contai…
Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using GitVersion.Model.Configuration;
using GitVersion.VersionCalculation;
using GitVersionCore.Tests.Helpers;
using GitVersionCore.Tests.IntegrationTests;
using GitVersionCore.Tests.Mocks;
using LibGit2Sharp;
using Microsoft.Extensions.DependencyInjection;
Expand Down Expand Up @@ -214,5 +215,20 @@ public void PreReleaseNumberShouldBeScopeToPreReleaseLabelInContinuousDelivery()

fixture.AssertFullSemver("0.1.0-beta.1+2", config);
}

[Test]
public void GetNextVersionOnNonMainlineBranchWithoutCommitsShouldWorkNormally()
{
var config = new Config
{
VersioningMode = VersioningMode.Mainline,
NextVersion = "1.0.0"
};

using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit("initial commit");
fixture.BranchTo("feature/f1");
fixture.AssertFullSemver("1.0.0-f1.0", config);
}
}
}
15 changes: 9 additions & 6 deletions src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,17 @@ private Commit FindMergeBaseBeforeForwardMerge(Commit baseVersionSource, Branch
// detect forward merge and rewind mainlineTip to before it
if (mergeBase == context.CurrentCommit && !mainlineCommitLog.Contains(mergeBase))
{
var mainlineTipPrevious = mainlineTip.Parents.First();
var message = $"Detected forward merge at {mainlineTip}; rewinding mainline to previous commit {mainlineTipPrevious}";
var mainlineTipPrevious = mainlineTip.Parents.FirstOrDefault();
if (mainlineTipPrevious != null)
{
var message = $"Detected forward merge at {mainlineTip}; rewinding mainline to previous commit {mainlineTipPrevious}";

log.Info(message);
log.Info(message);

// re-do mergeBase detection before the forward merge
mergeBase = repositoryMetadataProvider.FindMergeBase(context.CurrentCommit, mainlineTipPrevious);
mainlineTip = GetEffectiveMainlineTip(mainlineCommitLog, mergeBase, mainlineTipPrevious);
// re-do mergeBase detection before the forward merge
mergeBase = repositoryMetadataProvider.FindMergeBase(context.CurrentCommit, mainlineTipPrevious);
mainlineTip = GetEffectiveMainlineTip(mainlineCommitLog, mergeBase, mainlineTipPrevious);
}
}

return mergeBase;
Expand Down