Skip to content
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.

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

1072: Skara should validate the commit hash of a Backport PR #1184



Copy link

@erikj79 erikj79 commented Jun 7, 2021

Add a check for "Backport " titles that the given hash isn't the head of the PR itself. If the user mistakenly uses that hash, Skara is very likely to get fooled into thinking the backport is clean.

While investigating this, I also discovered that the CheckWorkItem was inconsistent with not repeating "backport" errors, so I implemented a general mechanism for this, which guarantees that the same exact error message is never repeated. I believe this will be good enough, and certainly better than the existing behavior.


  • Change must not contain extraneous whitespace
  • Change must be properly reviewed


  • SKARA-1072: Skara should validate the commit hash of a Backport PR



Using git

Checkout this PR locally:
$ git fetch pull/1184/head:pull/1184
$ git checkout pull/1184

Update a local copy of the PR:
$ git checkout pull/1184
$ git pull pull/1184/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1184

View PR using the GUI difftool:
$ git pr show -t 1184

Using diff file

Download this PR as a diff file:

Copy link

@bridgekeeper bridgekeeper bot commented Jun 7, 2021

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title SKARA-1072 1072: Skara should validate the commit hash of a Backport PR Jun 7, 2021
@openjdk openjdk bot added the rfr label Jun 7, 2021
Copy link

@mlbridge mlbridge bot commented Jun 7, 2021


…nly contains changes already present in the target.
Copy link
Member Author

@erikj79 erikj79 commented Jun 8, 2021

As we found another instance of this issue, that instance highlighted another, related, problem. If a proposed backport (or any change for that matter, but backports seem more likely) has already been done, basically making the changes in the PR redundant when merged with the target, this wasn't handled well today. I have added a check for this as well.

Copy link

@kevinrushforth kevinrushforth left a comment

Looks good.

Did you want to add a test where the specified backport hash was a commit in the PR other than the head?

Copy link

@openjdk openjdk bot commented Jun 8, 2021

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

After integration, the commit message for the final commit will be:

1072: Skara should validate the commit hash of a Backport PR

Reviewed-by: kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jun 8, 2021
Copy link
Member Author

@erikj79 erikj79 commented Jun 9, 2021

Added test as asked.

Copy link
Member Author

@erikj79 erikj79 commented Jun 9, 2021


@openjdk openjdk bot closed this Jun 9, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jun 9, 2021
Copy link

@openjdk openjdk bot commented Jun 9, 2021

@erikj79 Pushed as commit 5b081a7.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants