(WIP) [JENKINS-20389] Merge commits trigger uneccessary builds when Include/Exclude regions are defined#326
Closed
MarkEWaite wants to merge 29 commits intojenkinsci:masterfrom
Closed
Conversation
similar to git diff --name-only, so that it can be used to accurately identify changed paths for include/exclude regions.
similar to git diff --name-only, so that it can be used to accurately identify changed paths for include/exclude regions.
JGit does not support Octopus merge
JGit does not seem to have an implementation of an octopus merge, so the test falls back to performing the octopus merge with command line git.
Tests used to show places where the behavior is different between command line git and JGit implementation of showChangedPaths, and where the results are unexpected for both implementations.
The showChangedPaths() method for CliGitAPIImpl returns duplicates in the list, while the JGit implementation only returns the matching items
One case where the method is not consistent is documented inside the assertion.
Rename to match the wider use
Use assertion more widely
…/merge-commits-include-regions
* Fix cli empty and duplicate responses * Fix jGit diff to use merge base for the start commit
…ts-include-regions
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Conflicts resolved that exist in #162 .
This fix may be necessary but is not sufficient. The case described in JENKINS-20389 will require changes to the git plugin to use the new APIs proposed by #162 (and included in this pull request). The new API's