Skip to content

Return null for unmergable heads rather than excepting #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Return null for unmergable heads rather than excepting #386

Changes from 5 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ec33fd
Return null for unmergable hashes rather than excepting
mrginglymus Feb 14, 2021
8808e6e
Merge branch 'task/formatting-base' into handle-unmergables
bitwiseman Mar 4, 2021
d5697b6
Apply autoformatting
bitwiseman Mar 4, 2021
33a14e6
Merge remote-tracking branch 'upstream/master' into handle-unmergables
bitwiseman Mar 4, 2021
8ac1fa0
Merge branch 'master' into handle-unmergables
bitwiseman Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,16 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener)
}
PullRequestSCMRevision prRev =
createPullRequestSCMRevision(pr, prhead, listener, ghRepository);
prRev.validateMergeHash();
try {
Copy link
Contributor

@bitwiseman bitwiseman Apr 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We only need to do this if the prHead is a merge, right?
Maybe encapsulate this in a method and call from the two different places we currently call validateMergeHash()?
getValidatedMergeOrNull()?

prRev.validateMergeHash();
} catch (AbortException e) {
listener
.getLogger()
.format(
"Resolved %s as unmergable pull request %d: %s.%n",
prhead.getName(), prhead.getNumber(), prRev.getPullHash());
return null;
}
return prRev;
} else if (head instanceof GitHubTagSCMHead) {
GitHubTagSCMHead tagHead = (GitHubTagSCMHead) head;
Expand Down