fix(config): When getting branch config, if we try to inherit branch config and get the fallback config, overwrite increment to not have an infinite inherit issue

Author: Jake Ginnivan

src/GitVersionCore/BranchConfigurationCalculator.cs

@@ -27,11 +27,20 @@ public static BranchConfig GetBranchConfiguration(GitVersionContext context, Bra
                 ConfigurationProvider.ApplyBranchDefaults(context.FullConfiguration, matchingBranches, "", new List<string>());
             }
 
-            return matchingBranches.Increment == IncrementStrategy.Inherit ?
-                InheritBranchConfiguration(context, targetBranch, matchingBranches, excludedInheritBranches) :
-                matchingBranches;
+            if (matchingBranches.Increment == IncrementStrategy.Inherit)
+            {
+                matchingBranches = InheritBranchConfiguration(context, targetBranch, matchingBranches, excludedInheritBranches);
+                if (matchingBranches.Name == FallbackConfigName && matchingBranches.Increment == IncrementStrategy.Inherit)
+                {
+                    // We tried, and failed to inherit, just fall back to patch
+                    matchingBranches.Increment = IncrementStrategy.Patch;
+                }
+            }
+
+            return matchingBranches;
         }
 
+        // TODO I think we need to take a fresh approach to this.. it's getting really complex with heaps of edge cases
         static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch targetBranch, BranchConfig branchConfiguration, IList<Branch> excludedInheritBranches)
         {
             var repository = context.Repository;
@@ -94,13 +103,36 @@ static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch
                 if (possibleParents.Count == 1)
                 {
                     var branchConfig = GetBranchConfiguration(context, possibleParents[0], excludedInheritBranches);
-                    return new BranchConfig(branchConfiguration)
+                    // If we have resolved a fallback config we should not return that we have got config
+                    if (branchConfig.Name != FallbackConfigName)
                     {
-                        Increment = branchConfig.Increment,
-                        PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion,
-                        // If we are inheriting from develop then we should behave like develop
-                        TracksReleaseBranches = branchConfig.TracksReleaseBranches
-                    };
+                        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 (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