[Bugfix] CommitsSinceVersionSource decreases upon deleting a merged Release branch #1635
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
|
Just chiming in that I'm seeing this issue, and am surprised to see an hour old PR that will remediate it :). 👍 |
added 3 commits
March 13, 2019 16:56
…merged and deleted
… a MergeMessageBaseVersionStrategy
ruhullahshah
force-pushed
the
bugfix/CommitsSinceVersionSource-goes-down-on-deleting-a-merged-feature
branch
from
dcd9215 to
a100491
Compare
|
Amazing, thanks @ruhullahshah! |
|
@asbjornu You are welcome |
ruhullahshah
deleted the
bugfix/CommitsSinceVersionSource-goes-down-on-deleting-a-merged-feature
branch
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.
Problem:
Upon deleting a merged
releasebranch,CommitsSinceVersionSourcedecreases as reported in issue #1526.Root Cause:
After the
releasebranch is deleted, we have no way to calculate theBaseVersionSourcecorrectly from the existingBaseVersioncalculation strategies.Assumptions:
releasebranch was merged using the--no-ffpolicy.Merge branchandreleasekeywords.Fix:
The intuition behind the fix is that if a
releasebranch was merged with the stated assumptions and deleted, then theBaseVersionSourcecalculated byMergeMessageBaseVersionStrategyis updated to point to themerge-baseof the parents of the merge commit. The existing code then calculates theCommitsSinceVersionSourcecorrectly.