Merge pull request #978 from lerthe61/tagsVersioning

Version calculation should not use tags from not merged branch

Author: asbjornu

src/GitVersionCore.Tests/IntegrationTests/OtherBranchScenarios.cs

@@ -2,6 +2,7 @@
 using GitVersionCore.Tests;
 using LibGit2Sharp;
 using NUnit.Framework;
+using Shouldly;
 
 [TestFixture]
 public class OtherBranchScenarios
@@ -20,6 +21,7 @@ public void CanTakeVersionFromReleaseBranch()
             fixture.AssertFullSemver("2.0.0-alpha.1+0");
         }
     }
+
     [Test]
     public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()
     {
@@ -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");
+        }
+    }
 }