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

pr: improve message for unexpected merge commits #693

Closed
wants to merge 2 commits into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jul 4, 2020

Hi all,

please review this patch that improves the warning when a pull request contains a merge request that brings in commits not present in the target repository. This indicates that the user might wanted to do a "merge style" pull request, but can also arise in other scenarios.

Testing:

  • make test passes on Linux x64

Thanks,
Erik


Progress

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

Reviewers

  • Robin Westberg (rwestberg - Reviewer) ⚠️ Review applies to a4b94ac
  • Kevin Rushforth (kcr - no project role) ⚠️ Review applies to a4b94ac

Download

$ git fetch https://git.openjdk.java.net/skara pull/693/head:pull/693
$ git checkout pull/693

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 4, 2020

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 4, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good, just one grammar suggestion. :)

@@ -1064,7 +1064,7 @@ void foreignCommitWarning(TestInfo testInfo) throws IOException {
TestBotRunner.runPeriodicItems(mergeBot);

// There should be a warning
assertLastCommentContains(pr, "This pull request looks like it contains a merge commit");
assertLastCommentContains(pr, "This pull request contains merges that brings in commits not present");
Copy link
Member

@rwestberg rwestberg Jul 4, 2020

Choose a reason for hiding this comment

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

Suggested change
assertLastCommentContains(pr, "This pull request contains merges that brings in commits not present");
assertLastCommentContains(pr, "This pull request contains merges that bring in commits not present");

@openjdk
Copy link

@openjdk openjdk bot commented Jul 4, 2020

@edvbld This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

pr: improve message for unexpected merge commits

Reviewed-by: rwestberg, kcr
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

There are currently no new commits on the master branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate cfc4cc540466ee669a05e173426c075aae72494d.

➡️ 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 Jul 4, 2020
Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good (aside from Robin's comment).

Co-authored-by: Robin Westberg <robin@westberg.se>
@edvbld
Copy link
Member Author

@edvbld edvbld commented Jul 7, 2020

/integrate

@openjdk openjdk bot closed this Jul 7, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 7, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jul 7, 2020

@edvbld
Pushed as commit fce40b5.

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