Fixed broken test

Author: JakeGinnivan

GitVersionCore.Tests/Fixtures/EmptyRepositoryFixture.cs

@@ -9,11 +9,6 @@ public EmptyRepositoryFixture(Config configuration) :
     {
     }
 
-    public void DumpGraph()
-    {
-        Repository.DumpGraph();
-    }
-
     static IRepository CreateNewRepository(string path)
     {
         LibGit2Sharp.Repository.Init(path);

GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using GitVersion;
 using LibGit2Sharp;
 using Shouldly;
@@ -30,7 +31,16 @@ public void AssertFullSemver(string fullSemver, IRepository repository = null, s
             gitVersionContext.Configuration.VersioningMode, 
             gitVersionContext.Configuration.ContinuousDeploymentFallbackTag,
             gitVersionContext.IsCurrentCommitTagged);
-        variables.FullSemVer.ShouldBe(fullSemver);
+        try
+        {
+            variables.FullSemVer.ShouldBe(fullSemver);
+        }
+        catch (Exception)
+        {
+            Trace.WriteLine("Test failing, dumping repository graph");
+            repository.DumpGraph();
+            throw;
+        }
     }
 
     private SemanticVersion ExecuteGitVersion(GitVersionContext context)

GitVersionCore.Tests/Helpers/GitTestExtensions.cs

@@ -20,7 +20,7 @@ public static void DumpGraph(this IRepository repository)
             e => output.AppendLineFormat("ERROR: {0}", e),
             null,
             "git",
-            @"log --graph --abbrev-commit --decorate --date=relative --all",
+            @"log --graph --abbrev-commit --decorate --date=relative --all --remotes=*",
             repository.Info.Path);
 
         Trace.Write(output.ToString());

GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs

@@ -16,7 +16,7 @@ public void CanCalculatePullRequestChanges()
 
             fixture.Repository.CreatePullRequest("feature/Foo", "master");
 
-            fixture.DumpGraph();
+            fixture.Repository.DumpGraph();
             fixture.AssertFullSemver("0.1.1-PullRequest.2+2");
         }
     }
@@ -34,7 +34,7 @@ public void CanCalculatePullRequestChangesInheritingConfig()
 
             fixture.Repository.CreatePullRequest("feature/Foo", "develop", 44);
 
-            fixture.DumpGraph();
+            fixture.Repository.DumpGraph();
             fixture.AssertFullSemver("0.2.0-PullRequest.44+3");
         }
     }
@@ -51,7 +51,7 @@ public void CanCalculatePullRequestChangesFromRemoteRepo()
 
             fixture.Repository.CreatePullRequest("feature/Foo", "master");
 
-            fixture.DumpGraph();
+            fixture.Repository.DumpGraph();
             fixture.AssertFullSemver("0.1.1-PullRequest.2+2");
         }
     }

GitVersionCore/BranchConfigurationCalculator.cs

@@ -105,12 +105,6 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
 
             Logger.WriteInfo("Found possible parent branches: " + string.Join(", ", possibleParents.Select(p => p.Name)));
 
-            // 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.Count == 1)
             {
                 var branchConfig = GetBranchConfiguration(currentCommit, repository, onlyEvaluateTrackedBranches, config, possibleParents[0], excludedInheritBranches).Value;

GitVersionCore/LibGitExtensions.cs

@@ -26,7 +26,7 @@ public static Branch FindBranch(this IRepository repository, string branchName)
 
         public static Commit FindCommitBranchWasBranchedFrom(this Branch branch, IRepository repository, params Branch[] excludedBranches)
         {
-            var otherBranches = repository.Branches.Where(b => !b.IsRemote).Except(excludedBranches).Except(new [] { branch }).ToList();
+            var otherBranches = repository.Branches.Except(excludedBranches).Where(b => IsSameBranch(branch, b)).ToList();
             var mergeBases = otherBranches.Select(b =>
             {
                 var otherCommit = b.Tip;
@@ -36,10 +36,15 @@ public static Commit FindCommitBranchWasBranchedFrom(this Branch branch, IReposi
                 }
                 var mergeBase = repository.Commits.FindMergeBase(otherCommit, branch.Tip);
                 return mergeBase;
-            }).Where(b => b != null);
+            }).Where(b => b != null).ToList();
             return mergeBases.OrderByDescending(b => b.Committer.When).FirstOrDefault();
         }
 
+        static bool IsSameBranch(Branch branch, Branch b)
+        {
+            return (b.IsRemote ? b.Name.Replace(b.Remote.Name + "/", string.Empty) : b.Name) != branch.Name;
+        }
+
         public static IEnumerable<Branch> GetBranchesContainingCommit(this Commit commit, IRepository repository, bool onlyTrackedBranches)
         {
             var directBranchHasBeenFound = false;

GitVersionCore/VersionCalculation/MetaDataCalculator.cs

@@ -16,6 +16,7 @@ public SemanticVersionBuildMetaData Create(Commit baseVersionSource, GitVersionC
 
             var commitLog = context.Repository.Commits.QueryBy(qf);
             var commitsSinceTag = commitLog.Count();
+            Logger.WriteInfo(string.Format("{0} commits found between {1} and {2}", commitsSinceTag, baseVersionSource.Sha, context.CurrentCommit.Sha));
 
             return new SemanticVersionBuildMetaData(
                 commitsSinceTag,

GitVersionExe.Tests/GitPreparerTests.cs

@@ -109,7 +109,7 @@ public void UpdatesExistingDynamicRepository()
 
                 using (var repository = new Repository(dynamicRepositoryPath))
                 {
-                    mainRepositoryFixture.DumpGraph();
+                    mainRepositoryFixture.Repository.DumpGraph();
                     repository.DumpGraph();
                     repository.Commits.ShouldContain(c => c.Sha == newCommit.Sha);
                 }