Skip to content

Ignore version numbers in branch names that are not release branches. #1541

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 13 commits into from
Feb 15, 2019
Merged

Ignore version numbers in branch names that are not release branches. #1541

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
854cb55
Ignore unrelated version numbers in branch names that are not release
bert2 Dec 2, 2018
cd78046
extract duplication from the strategies
bert2 Dec 3, 2018
245c9fa
Merge branch 'master' into bugfix/issue-1536-ignore-versions-in-branc…
bert2 Dec 7, 2018
ccd0330
Merge remote-tracking branch 'upstream/master' into bugfix/issue-1536…
bert2 Dec 17, 2018
9fd376c
take versions from branch names only when they are release (remove co…
bert2 Dec 20, 2018
1a572aa
remove namespace of new mock types
bert2 Dec 20, 2018
ad59a80
only consider origin a remote that can have release branches
bert2 Dec 21, 2018
0ba2eda
Merge branch 'master' into bugfix/issue-1536-ignore-versions-in-branc…
bert2 Dec 21, 2018
692c35a
Merge branch 'master' into bugfix/issue-1536-ignore-versions-in-branc…
bert2 Dec 21, 2018
1c84f2d
fix: takes version from the current branch name even when its not fro…
bert2 Dec 21, 2018
c515c25
tests if custom remotes are ignored when taking version from current …
bert2 Dec 21, 2018
ec5d880
integration test ignoring of versions from branch names in custom rem…
bert2 Dec 22, 2018
426de26
Merge branch 'master' into bugfix/issue-1536-ignore-versions-in-branc…
asbjornu Feb 15, 2019
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
Prev Previous commit
Next Next commit
tests if custom remotes are ignored when taking version from current … 
…branch name
  • Loading branch information
@bert2
bert2 committed Dec 21, 2018
commit c515c259f15465e88648b28453a7f6df74bf082d
18 changes: 17 additions & 1 deletion src/GitVersionCore.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
}

[Test]
public void TakesVersionFromNameOfRemoteReleaseBranch()
public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
{
using (var fixture = new RemoteRepositoryFixture())
{
Expand All @@ -68,5 +68,21 @@ public void TakesVersionFromNameOfRemoteReleaseBranch()
fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0-beta.1+1");
}
}

[Test]
public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
{
using (var fixture = new RemoteRepositoryFixture())
{
fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, new string[0], new FetchOptions(), null);

fixture.LocalRepositoryFixture.Checkout("upstream/release/2.0.0");

fixture.LocalRepositoryFixture.AssertFullSemver("0.1.0-beta.1+5");
}
}
}
}