Fix/release issues #1342
Fix/release issues #1342
Conversation
…config and get the fallback config, overwrite increment to not have an infinite inherit issue
asbjornu
left a comment
asbjornu
left a comment
There was a problem hiding this comment.
I'd rather have too many than too few checks in place to avoid infinite loops, so this looks good to me.
|
Ok, looked into this a bit harder. Am now actually excluding branches which have no config or their branch config is inherit. This should mean that we don't resolve a branch with increment of inherit. I think this is actually the real fix for now. |
| return matchingBranches.Increment == IncrementStrategy.Inherit ? | ||
| InheritBranchConfiguration(context, targetBranch, matchingBranches, excludedInheritBranches) : | ||
| matchingBranches; | ||
| if (matchingBranches.Increment == IncrementStrategy.Inherit) |
There was a problem hiding this comment.
This shouldn't happen now because we filter the conditions which would cause this code to be executed. But still, I think it's worth keeping in just in case
| excludedInheritBranches = repository.Branches.Where(b => | ||
| { | ||
| var branchConfig = config.GetConfigForBranch(b.FriendlyName); | ||
| var branchConfig = config.GetConfigForBranch(b.NameWithoutRemote()); |
There was a problem hiding this comment.
This I think is the real fix. This will now exclude local and remote branches which do not have config, or the config is Inherit.
Previously we only excluded branches which had config and it was Inherit, but our infinite loops were caused by branches without config..
…nfig without the remote name
2 participants
Some of these fixes may not be needed because of other fixes, but trying to stamp out any chance of infinite config lookups..