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

362: Only amend merge commits that has the target branch as parent #584

Closed
wants to merge 3 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Apr 16, 2020

Hi all,

Please review this change that avoids performing automatic rebasing of Merge PRs, as that doesn't work correctly in all cases.

Best regards,
Robin


Progress

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

Issue

  • SKARA-362: Only amend merge commits that has the target branch as parent

Reviewers

  • Erik Helin (ehelin - Reviewer) ⚠️ Review applies to b5f320e

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 16, 2020

👋 Welcome back rwestberg! 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 Apr 16, 2020

Webrevs

edvbld
edvbld approved these changes Apr 16, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Apr 16, 2020

@rwestberg 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:

362: Only amend merge commits that has the target branch as parent

Reviewed-by: ehelin
  • 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 /solves command.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 87aeddea47df6b45eb90a1b241132fa27ca7c298.

➡️ 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 Apr 16, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 16, 2020

/integrate

@openjdk openjdk bot closed this Apr 16, 2020
@openjdk openjdk bot added integrated and removed ready labels Apr 16, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Apr 16, 2020

@rwestberg The following commits have been pushed to master since your change was applied:

  • 87aedde: cli: add git-proxy tool
  • 2139bf5: 364: The bots should not fetch tags by default

Your commit was automatically rebased without conflicts.

Pushed as commit fed3500.

@openjdk openjdk bot removed the rfr label Apr 16, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 16, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: fed3500
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-04-16 12:31:00 +0000
URL: https://git.openjdk.java.net/skara/commit/fed35009

362: Only amend merge commits that has the target branch as parent

Reviewed-by: ehelin

! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java
! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java

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