Skip to content

Version calculation should not use tags from not merged branch #978

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
asbjornu merged 1 commit into from
Aug 9, 2016
Merged

Version calculation should not use tags from not merged branch #978

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions src/GitVersionCore.Tests/IntegrationTests/OtherBranchScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using GitVersionCore.Tests;
using LibGit2Sharp;
using NUnit.Framework;
using Shouldly;

[TestFixture]
public class OtherBranchScenarios
Expand All @@ -20,6 +21,7 @@ public void CanTakeVersionFromReleaseBranch()
fixture.AssertFullSemver("2.0.0-alpha.1+0");
}
}

[Test]
public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()
{
Expand All @@ -34,4 +36,25 @@ public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()
fixture.AssertFullSemver("1.0.4-issue-m-github-569.1+5");
}
}

[Test]
public void ShouldNotGetVersionFromFeatureBranchIfNotMerged()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeATaggedCommit("1.0.0-unstable.0"); // initial commit in master

fixture.Repository.CreateBranch("feature");
fixture.Repository.Checkout("feature");
fixture.Repository.MakeATaggedCommit("1.0.1-feature.1");

fixture.Repository.Checkout("master");
fixture.Repository.CreateBranch("develop");
fixture.Repository.Checkout("develop");
fixture.Repository.MakeACommit();

var version = fixture.GetVersion();
version.SemVer.ShouldBe("1.0.0-unstable.1");
}
}
}