Fixed a few tests and the way inheriting increment strategy works

Author: JakeGinnivan

GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs

@@ -1,8 +1,6 @@
 using System;
 using System.IO;
-using System.Text;
 using GitVersion;
-using GitVersion.Helpers;
 using LibGit2Sharp;
 
 /// <summary>
@@ -41,19 +39,4 @@ void SetupRepo(Action<IRepository> initialMasterAction)
         Repository.CreateBranch("develop").Checkout();
         Repository.MakeACommit();
     }
-
-    public void DumpGraph()
-    {
-        var output = new StringBuilder();
-
-        ProcessHelper.Run(
-            o => output.AppendLine(o),
-            e => output.AppendLineFormat("ERROR: {0}", e),
-            null,
-            "git",
-            @"log --graph --abbrev-commit --decorate --date=relative --all",
-            RepositoryPath);
-
-        Console.Write(output.ToString());
-    }
 }

GitVersionCore.Tests/Fixtures/EmptyRepositoryFixture.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Text;
 using GitVersion;
+using GitVersion.Helpers;
 using LibGit2Sharp;
 
 public class EmptyRepositoryFixture : RepositoryFixtureBase
@@ -9,6 +11,21 @@ public EmptyRepositoryFixture(Config configuration) :
     {
     }
 
+    public void DumpGraph()
+    {
+        var output = new StringBuilder();
+
+        ProcessHelper.Run(
+            o => output.AppendLine(o),
+            e => output.AppendLineFormat("ERROR: {0}", e),
+            null,
+            "git",
+            @"log --graph --abbrev-commit --decorate --date=relative --all",
+            RepositoryPath);
+
+        Console.Write(output.ToString());
+    }
+
     static IRepository CreateNewRepository(string path)
     {
         LibGit2Sharp.Repository.Init(path);

GitVersionCore.Tests/GitVersionContextTests.cs

@@ -68,7 +68,7 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
                 featureBranch.Checkout();
                 repo.Repository.MakeACommit();
 
-                var context = new GitVersionContext(repo.Repository, featureBranch, config);
+                var context = new GitVersionContext(repo.Repository, config);
                 context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);
             }
         }

GitVersionCore/GitVersionContext.cs

@@ -107,21 +107,20 @@ KeyValuePair<string, BranchConfig> GetBranchConfiguration(Branch currentBranch)
 
                 if (branchConfiguration.Increment == IncrementStrategy.Inherit)
                 {
-                    var firstCommitOfBranch = currentBranch.Commits.Last();
-                    var parentCommit = Repository.Commits.QueryBy(new CommitFilter
-                    {
-                        Until = firstCommitOfBranch
-                    }).First().Parents.First();
-                    var branchesContainingFirstCommit = ListBranchesContaininingCommit(Repository, firstCommitOfBranch.Sha);
-                    var branchesContainingParentCommit = ListBranchesContaininingCommit(Repository, parentCommit.Sha);
-
+                    var tips = Repository.Branches.Select(b => b.Tip).Where(c => c.Sha != CurrentCommit.Sha).ToList();
+                    var branchPoint = Repository.Commits.First(c => tips.Contains(c) || c.Parents.Count() > 1);
+                    var branches = ListBranchesContaininingCommit(Repository, branchPoint.Sha).ToArray();
+                    var currentTipBranches = ListBranchesContaininingCommit(Repository, CurrentCommit.Sha).ToArray();
                     var branchNameComparer = new BranchNameComparer();
-                    var possibleParents = branchesContainingFirstCommit
-                        .Intersect(branchesContainingParentCommit, branchNameComparer)
-                        .Except(new[] { currentBranch }, branchNameComparer)
-                        .ToArray();
+                    var possibleParents = branches
+                        .Except(currentTipBranches, branchNameComparer)
+                        .ToList();
+
+                    // If it comes down to master and something, master is always first so we pick other branch
+                    if (possibleParents.Count == 2 && possibleParents.Any(p => p.Name == "master"))
+                        possibleParents.Remove(possibleParents.Single(p => p.Name == "master"));
 
-                    if (possibleParents.Length == 1)
+                    if (possibleParents.Count == 1)
                     {
                         return new KeyValuePair<string, BranchConfig>(
                             keyValuePair.Key,