Improved version calculation for feature branches in mainline mode - … #1168
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
…ixes GitTools#1154 In short when calculating the direct commits to master we need to remove any commits which are not on master. Otherwise we bump the mainline version on feature branches way too much. We also need to increment feature branches at the end of feature calculation unless the HEAD is a merge commit into the mainline branch (to cater for pull requests).
JakeGinnivan
force-pushed
the
feature/mainline-commit-count-fix
branch
from
d100355 to
41c0671
Compare
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.
…fixes #1154
In short when calculating the direct commits to master we need to remove any commits which are not on master. Otherwise we bump the mainline version on feature branches way too much. We also need to increment feature branches at the end of feature calculation unless the HEAD is a merge commit into the mainline branch (to cater for pull requests).