Merge pull request #1015 from markryd/master

Issue when merging master to a branch and then back to master using Mainline

Author: JakeGinnivan

src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs

@@ -178,9 +178,9 @@ public void VerifySupportForwardMerge()
             fixture.MakeACommit("+semver: minor");
             fixture.AssertFullSemver(config, "1.1.0");
             fixture.MergeNoFF("support/1.0");
-            fixture.AssertFullSemver(config, "1.1.2");
+            fixture.AssertFullSemver(config, "1.1.1");
             fixture.MakeACommit();
-            fixture.AssertFullSemver(config, "1.1.3");
+            fixture.AssertFullSemver(config, "1.1.2");
             fixture.Checkout("support/1.0");
             fixture.AssertFullSemver(config, "1.0.4");
 
@@ -190,6 +190,88 @@ public void VerifySupportForwardMerge()
             fixture.AssertFullSemver(config, "1.0.4-foo.2"); // TODO This probably should be 1.0.5
         }
     }
+
+    [Test]
+    public void VerifyMergingMasterToFeatureDoesNotCauseBranchCommitsToIncrementVersion()
+    {
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.MakeACommit("first in master");
+
+            fixture.BranchTo("feature/foo", "foo");
+            fixture.MakeACommit("first in foo");
+            
+            fixture.Checkout("master");
+            fixture.MakeACommit("second in master");
+
+            fixture.Checkout("feature/foo");
+            fixture.MergeNoFF("master");
+            fixture.MakeACommit("second in foo");
+
+            fixture.Checkout("master");
+            fixture.MakeATaggedCommit("1.0.0");
+
+            fixture.MergeNoFF("feature/foo");
+            fixture.AssertFullSemver(config, "1.0.1");
+        }
+    }
+
+    [Test]
+    public void VerifyMergingMasterToFeatureDoesNotStopMasterCommitsIncrementingVersion()
+    {
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.MakeACommit("first in master");
+
+            fixture.BranchTo("feature/foo", "foo");
+            fixture.MakeACommit("first in foo");
+
+            fixture.Checkout("master");
+            fixture.MakeATaggedCommit("1.0.0");
+            fixture.MakeACommit("third in master");
+
+            fixture.Checkout("feature/foo");
+            fixture.MergeNoFF("master");
+            fixture.MakeACommit("second in foo");
+
+            fixture.Checkout("master");
+            fixture.MergeNoFF("feature/foo");
+            fixture.AssertFullSemver(config, "1.0.2");
+        }
+    }
+
+    [Test]
+    public void VerifyMergingMasterIntoAFeatureBranchWorksWithMultipleBranches()
+    {
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.MakeACommit("first in master");
+
+            fixture.BranchTo("feature/foo", "foo");
+            fixture.MakeACommit("first in foo");
+
+            fixture.BranchTo("feature/bar", "bar");
+            fixture.MakeACommit("first in bar");
+
+            fixture.Checkout("master");
+            fixture.MakeACommit("second in master");
+
+            fixture.Checkout("feature/foo");
+            fixture.MergeNoFF("master");
+            fixture.MakeACommit("second in foo");
+
+            fixture.Checkout("feature/bar");
+            fixture.MergeNoFF("master");
+            fixture.MakeACommit("second in bar");
+
+            fixture.Checkout("master");
+            fixture.MakeATaggedCommit("1.0.0");
+
+            fixture.MergeNoFF("feature/foo");
+            fixture.MergeNoFF("feature/bar");
+            fixture.AssertFullSemver(config, "1.0.2");
+        }
+    }
 }
 
 static class CommitExtensions

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -99,8 +99,10 @@ SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion, GitVersionConte
                 {
                     IncludeReachableFrom = context.CurrentBranch,
                     ExcludeReachableFrom = baseVersion.BaseVersionSource,
-                    SortBy = CommitSortStrategies.Reverse
+                    SortBy = CommitSortStrategies.Reverse,
+                    FirstParentOnly = true
                 }).Where(c => c.Sha != baseVersion.BaseVersionSource.Sha).ToList();
+
                 var directCommits = new List<Commit>();
 
                 // Scans commit log in reverse, aggregating merge commits