Should use targetBranch.Tip instead of CurrentCommit to give merge commit PRs a better chance of resolving

Jake Ginnivan · Jake Ginnivan · commit 26f85a0b3bfc · 2017-12-04T18:20:42.000+08:00
diff --git a/src/GitVersionCore/BranchConfigurationCalculator.cs b/src/GitVersionCore/BranchConfigurationCalculator.cs
@@ -65,7 +65,7 @@ static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch
                 List<Branch> possibleParents;
                 if (branchPoint == BranchCommit.Empty)
                 {
-                    possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(context.CurrentCommit, branchesToEvaluate, true)
+                    possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(targetBranch.Tip, branchesToEvaluate, true)
                         // It fails to inherit Increment branch configuration if more than 1 parent;
                         // therefore no point to get more than 2 parents
                         .Take(2)

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch`
`65`	`65`	`List<Branch> possibleParents;`
`66`	`66`	`if (branchPoint == BranchCommit.Empty)`
`67`	`67`	`{`
`68`		`- possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(context.CurrentCommit, branchesToEvaluate, true)`
	`68`	`+ possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(targetBranch.Tip, branchesToEvaluate, true)`
`69`	`69`	`// It fails to inherit Increment branch configuration if more than 1 parent;`
`70`	`70`	`// therefore no point to get more than 2 parents`
`71`	`71`	`.Take(2)`