Skip to content
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

#2034 StackOverflow when using increment: Inherit: new unit test #2059

Closed
wants to merge 2 commits into from
Closed

#2034 StackOverflow when using increment: Inherit: new unit test #2059

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14edecc
New unit test that repoduces #2034 issue
Jan 21, 2020
9d9c543
Merge branch 'master' into issue-2034-new-test
asbjornu Feb 11, 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
44 changes: 44 additions & 0 deletions src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,50 @@ public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionO
fixture.AssertFullSemver(currentConfig, "1.1.0");
}

[Test]
public void MergingMasterBarnchToDevelopWithInheritIncrementShouldIncrementDevelopPatch()
{
var currentConfig = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
VersioningMode = VersioningMode.Mainline,
Branches = new Dictionary<string, BranchConfig>
{
{
"master", new BranchConfig
{
Increment = IncrementStrategy.Patch
}
},
{
"develop", new BranchConfig
{
Increment = IncrementStrategy.Inherit
}
}
}
};

using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit("initial in master");
fixture.AssertFullSemver(currentConfig, "0.1.0");
fixture.MakeACommit("master change");
fixture.AssertFullSemver(currentConfig, "0.1.1");

fixture.BranchTo("develop");
fixture.AssertFullSemver(currentConfig, "0.1.2-alpha.0");
fixture.MakeACommit("develop change");
fixture.AssertFullSemver(currentConfig, "0.1.2-alpha.1");

fixture.Checkout("master");
fixture.MakeACommit("master hotfix");
fixture.AssertFullSemver(currentConfig, "0.1.2");

fixture.Checkout("develop");
fixture.MergeNoFF("master");
fixture.AssertFullSemver(currentConfig, "0.1.3-alpha.1");
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

StackOverflow exception here

}

[Test]
public void VerifyIncrementConfigIsHonoured()
{
Expand Down