Fixed BranchCreatedAfterFastForwardMergeShouldInheritCorrectly test

Author: JakeGinnivan

GitVersionCore/BranchConfigurationCalculator.cs

@@ -10,7 +10,7 @@ public class BranchConfigurationCalculator
     {
         public static KeyValuePair<string, BranchConfig> GetBranchConfiguration(Commit currentCommit, IRepository repository, bool onlyEvaluateTrackedBranches, Config config, Branch currentBranch, IList<Branch> excludedInheritBranches = null)
         {
-            var matchingBranches = config.Branches.Where(b => Regex.IsMatch(currentBranch.Name, "^" + b.Key, RegexOptions.IgnoreCase)).ToArray();
+            var matchingBranches = LookupBranchConfiguration(config, currentBranch);
 
             if (matchingBranches.Length == 0)
             {
@@ -33,6 +33,11 @@ public static KeyValuePair<string, BranchConfig> GetBranchConfiguration(Commit c
             throw new Exception(string.Format(format, currentBranch.Name, string.Join(", ", matchingBranches.Select(b => b.Key))));
         }
 
+        static KeyValuePair<string, BranchConfig>[] LookupBranchConfiguration(Config config, Branch currentBranch)
+        {
+            return config.Branches.Where(b => Regex.IsMatch(currentBranch.Name, "^" + b.Key, RegexOptions.IgnoreCase)).ToArray();
+        }
+
         static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEvaluateTrackedBranches, IRepository repository, Commit currentCommit, Branch currentBranch, KeyValuePair<string, BranchConfig> keyValuePair, BranchConfig branchConfiguration, Config config, IList<Branch> excludedInheritBranches)
         {
             Logger.WriteInfo("Attempting to inherit branch configuration from parent branch");
@@ -69,7 +74,11 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
             }
             if (excludedInheritBranches == null)
             {
-                excludedInheritBranches = new List<Branch>();
+                excludedInheritBranches = repository.Branches.Where(b =>
+                {
+                    var branchConfig = LookupBranchConfiguration(config, b);
+                    return branchConfig.Length == 1 && branchConfig[0].Value.Increment == IncrementStrategy.Inherit;
+                }).ToList();
             }
             excludedBranches.ToList().ForEach(excludedInheritBranches.Add);