From 55007c086c17fb76b87f690502971a440c39f29d Mon Sep 17 00:00:00 2001 From: Guillaume Rouchon Date: Thu, 11 Aug 2016 08:20:52 +0200 Subject: [PATCH] Develop version not bump if no new commit since release branch --- src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs | 2 +- .../VersionCalculation/DevelopVersionStrategy.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs index a7de0697dd..6310903f01 100644 --- a/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs +++ b/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs @@ -171,7 +171,7 @@ public void InheritVersionFromReleaseBranch() fixture.MakeACommit(); fixture.MakeACommit(); fixture.Checkout("develop"); - fixture.AssertFullSemver("2.1.0-alpha.0"); + fixture.AssertFullSemver("1.1.0-alpha.1"); fixture.MakeACommit(); fixture.AssertFullSemver("2.1.0-alpha.1"); fixture.MergeNoFF("release/2.0.0"); diff --git a/src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs index b74459f6d0..355bbfc63f 100644 --- a/src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs +++ b/src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs @@ -68,7 +68,11 @@ IEnumerable GetReleaseVersion(GitVersionContext context, Branch rel { var tagPrefixRegex = context.Configuration.GitTagPrefix; var repository = context.Repository; + var baseSource = releaseBranch.FindMergeBase(context.CurrentBranch, repository); + if (baseSource == context.CurrentCommit) + return new BaseVersion[0]; + return releaseVersionStrategy .GetVersions(tagPrefixRegex, releaseBranch, repository) .Select(b => new BaseVersion(b.Source, true, b.SemanticVersion, baseSource, b.BranchNameOverride));