Filter remote branches to fix PRs

Author: JakeGinnivan

GitVersionCore/GitVersionContext.cs

@@ -127,7 +127,7 @@ KeyValuePair<string, BranchConfig> InheritBranchConfiguration(Branch currentBran
             if (parentCount == 2)
             {
                 var parents = CurrentCommit.Parents.ToArray();
-                var branch = Repository.Branches.SingleOrDefault(b => b.Tip == parents[1]) ;
+                var branch = Repository.Branches.SingleOrDefault(b => !b.IsRemote && b.Tip == parents[1]) ;
                 if (branch != null)
                 {
                     excludedBranches = new[]
@@ -139,7 +139,7 @@ KeyValuePair<string, BranchConfig> InheritBranchConfiguration(Branch currentBran
                 }
                 else
                 {
-                    currentBranch = Repository.Branches.SingleOrDefault(b => b.Tip == parents[0]) ?? currentBranch;
+                    currentBranch = Repository.Branches.SingleOrDefault(b => !b.IsRemote && b.Tip == parents[0]) ?? currentBranch;
                 }
             }
 

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 tips = repository.Branches.Except(excludedBranches).Where(b => b != branch).Select(b => b.Tip).ToList();
+            var tips = repository.Branches.Except(excludedBranches).Where(b => b != branch && !b.IsRemote).Select(b => b.Tip).ToList();
             return branch.Commits.FirstOrDefault(c => tips.Contains(c) || c.Parents.Count() > 1) ?? branch.Tip;
         }