Fix/release issues #1342
Merged
Fix/release issues #1342
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
December 7, 2017 10:33
…config and get the fallback config, overwrite increment to not have an infinite inherit issue
asbjornu
approved these changes
Dec 8, 2017
|
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. |
JakeGinnivan
commented
Dec 9, 2017
| 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
JakeGinnivan
commented
Dec 9, 2017
| @@ -50,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()); | |||
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some of these fixes may not be needed because of other fixes, but trying to stamp out any chance of infinite config lookups..