JENKINS-57583 Ignore merge commmit when comparing revisions #227
Conversation
This file contains 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
We tried using strict merge commit handling to prevent cloning on master. This resulted in some edge cases for some users where PRs would simply not build and there was not viable workaround. Change: * Merge hash has been changed to best effort. If it is missing or inconsistent, Jenkins will gracefully revert to cloning on master. * Most validity checking for merge hash has been moved to create time. * Plugin tries harder than before to create a valid merge hash revision.
Other plugins assume that there are are only two revisions involved in PR revision identity. Since the mergeHash is generated based on the base and source hashes, it is not particularly interesting to use it and can cause bad behavior if we do. The only place where the mergeHash is interesting is when getting Jenkinsfile or doing readTrusted. It is an optimization that should have as few side effects as possible.
abayer
approved these changes
May 23, 2019
|
I've manually verified this works now. |
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.
Depends on #226 (diff only the one commit to see the changes).
Other plugins assume that there are are only two revisions
involved in PR revision identity. Since the mergeHash is generated
based on the base and source hashes, it is not particularly
interesting to use it and can cause bad behavior if we do.
The only place where the mergeHash is interesting is when
getting Jenkinsfile or doing readTrusted. It is an optimization
that should have as few side effects as possible.
https://issues.jenkins-ci.org/browse/JENKINS-57583