Integrated: 1424: CheckRun fails to evaluate jol#24

[Erik Joelsson]

On Tue, 3 May 2022 18:34:39 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> CheckRun, which is part of the PullRequestBot, is currently failing to evaluate https://github.com/openjdk/jol/pull/24. The failure happens in PullRequestUtils::containsForeignMerge where we are looking for merges in the PR branch which bring in commits that aren't descendants of the main merge parent. If this test is positive, the bot adds a comment with a warning.
> 
> The problem is that GitRepository::mergeBase doesn't differentiate between the git command failing with an error and when it just can't find a merge-base. For this check, a non existent merge-base should qualify for a positive test.
> 
> I'm refactoring Repository::mergeBase into two methods, one that returns an Optional, which will be empty when a merge-base can't be found. I've also gone through all callers to identify when the new method should be used to properly tell this situation apart.

This pull request has now been integrated.

Changeset: 15aea104
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/15aea1047876d7bd42e7fc3f421800d801075444
Stats:     35 lines in 3 files changed: 26 ins; 3 del; 6 mod

1424: CheckRun fails to evaluate jol#24

Reviewed-by: kcr

-------------

PR: https://git.openjdk.java.net/skara/pull/1312