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

Improve merge bot commit message #400

Closed
wants to merge 3 commits into from

Conversation

JornVernee
Copy link
Member

@JornVernee JornVernee commented Feb 5, 2020

The current commit message the merge bot uses just says

Merge

I'd like it if the message contained the branches involved as well, to be a little more informative. This patch changes the message to for instance:

Merge branch: 'branchA' into: 'branchB'

Progress

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

Approvers

  • Erik Helin (ehelin - Reviewer)

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 5, 2020

👋 Welcome back jvernee! 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 Feb 5, 2020

Webrevs

@edvbld
Copy link
Member

@edvbld edvbld commented Feb 5, 2020

How about "Automatic merge of branchA into branchB"? Just to make it clear that the merge was done automatically.

@JornVernee
Copy link
Member Author

@JornVernee JornVernee commented Feb 5, 2020

How about "Automatic merge of into "? Just to make it clear that the merge was done automatically.

Yes, good idea!

edvbld
edvbld approved these changes Feb 5, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Feb 5, 2020

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

Improve merge bot commit message

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.

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

@openjdk openjdk bot added the ready label Feb 5, 2020
@JornVernee
Copy link
Member Author

@JornVernee JornVernee commented Feb 5, 2020

/integrate

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

@openjdk openjdk bot commented Feb 5, 2020

@JornVernee
Pushed as commit 5c96b1c.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 5, 2020

Mailing list message from Jorn Vernee on skara-dev:

Changeset: 5c96b1c
Author: Jorn Vernee <jvernee at openjdk.org>
Date: 2020-02-05 14:46:59 +0000
URL: https://git.openjdk.java.net/skara/commit/5c96b1cc

Improve merge bot commit message

Reviewed-by: ehelin

! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java
! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java

@JornVernee JornVernee deleted the Merge_Message branch Feb 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants