Skip to content

Commit 845f54c

Browse files
committed
Add test for GH-2967
Add test for GH-2967. Unfortunately, it does not reproduce the `NullReferenceException`, but it may be useful as a regression test in the future. ¯\_(ツ)_/¯
1 parent 4db6cb7 commit 845f54c

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,26 @@ public void VerifyIncrementConfigIsHonoured()
517517
fixture.AssertFullSemver("3.1.3", minorIncrementConfig);
518518
Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
519519
}
520+
521+
[Test]
522+
public void BranchWithoutMergeBaseMainlineBranchIsFound()
523+
{
524+
var currentConfig = new Config
525+
{
526+
VersioningMode = VersioningMode.Mainline,
527+
AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatchTag
528+
};
529+
530+
using var fixture = new EmptyRepositoryFixture();
531+
fixture.Repository.MakeACommit();
532+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("master"));
533+
fixture.Repository.Branches.Remove(fixture.Repository.Branches["main"]);
534+
fixture.Repository.MakeCommits(2);
535+
Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("issue-branch"));
536+
fixture.Repository.MakeACommit();
537+
fixture.AssertFullSemver("0.1.3-issue-branch.1", currentConfig);
538+
}
539+
520540
}
521541

522542
internal static class CommitExtensions

0 commit comments

Comments
 (0)