Fixed logic around what branches to exclude from inheriting config

Author: JakeGinnivan

src/GitVersionCore/BranchConfigurationCalculator.cs

@@ -59,17 +59,17 @@ static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch
                 {
                     excludedInheritBranches = repository.Branches.Where(b =>
                     {
-                        var branchConfig = config.GetConfigForBranch(b.FriendlyName);
+                        var branchConfig = config.GetConfigForBranch(b.NameWithoutRemote());
 
-                        return branchConfig != null && branchConfig.Increment == IncrementStrategy.Inherit;
+                        return branchConfig == null || branchConfig.Increment == IncrementStrategy.Inherit;
                     }).ToList();
                 }
                 // Add new excluded branches.
                 foreach (var excludedBranch in excludedBranches.ExcludingBranches(excludedInheritBranches))
                 {
                     excludedInheritBranches.Add(excludedBranch);
                 }
-                var branchesToEvaluate = repository.Branches.Except(excludedInheritBranches).ToList();
+                var branchesToEvaluate = repository.Branches.ExcludingBranches(excludedInheritBranches).ToList();
 
                 var branchPoint = context.RepositoryMetadataProvider
                     .FindCommitBranchWasBranchedFrom(targetBranch, excludedInheritBranches.ToArray());
@@ -116,25 +116,6 @@ static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch
                     }
                 }
 
-                if (possibleParents.Count > 1)
-                {
-                    // Lets try and get the branch config for each possible parent, the first may not have config
-                    foreach (var possibleParent in possibleParents)
-                    {
-                        var branchConfig = GetBranchConfiguration(context, possibleParent, excludedInheritBranches);
-                        if (branchConfig.Name != FallbackConfigName)
-                        {
-                            return new BranchConfig(branchConfiguration)
-                            {
-                                Increment = branchConfig.Increment,
-                                PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion,
-                                // If we are inheriting from develop then we should behave like develop
-                                TracksReleaseBranches = branchConfig.TracksReleaseBranches
-                            };
-                        }
-                    }
-                }
-
                 // If we fail to inherit it is probably because the branch has been merged and we can't do much. So we will fall back to develop's config
                 // if develop exists and master if not
                 string errorMessage;