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

cli: add command git-backport #948

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Nov 9, 2020

Hi all,

please review this patch that adds the new CLI command git backport. A contributing backporting a commit can now simply run git backport --from=jdk <HASH> to backport a commit from the JDK repo targeting the current repository. The "other" direction is also possible, where the user runs the command in a local clone of their personal fork of the jdk repository: git backport --to=jdk16u <HASH>. The user can optionally supply a branch, as in git backport --to=jfx --branch=jfx14 <HASH>.

Behind the scenes the git backport do nothing more than just making a "backport" commit comment on the given hash.

Testing:

  • Manual testing on Linux x64

Thanks,
Erik


Progress

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

Testing

Linux x64 Windows x64 macOS x64
Build / test ✔️ (1/1 passed) ✔️ (1/1 passed) ✔️ (1/1 passed)

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 9, 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. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Nov 9, 2020
@mlbridge
Copy link

mlbridge bot commented Nov 9, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

openjdk bot commented Nov 10, 2020

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md 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.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

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

cli: add command git-backport

Reviewed-by: rwestberg

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 Nov 10, 2020
@edvbld
Copy link
Member Author

edvbld commented Nov 11, 2020

/integrate

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

openjdk bot commented Nov 11, 2020

@edvbld Since your change was applied there has been 1 commit pushed to the master branch:

  • 4afd995: Restrict merge PR commit titles if required by the jcheck configuration

Your commit was automatically rebased without conflicts.

Pushed as commit 4f35b6f.

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

openjdk-notifier bot referenced this issue Nov 11, 2020
Reviewed-by: rwestberg
@mrserb
Copy link
Member

mrserb commented Nov 16, 2020

For some reason, I do not see backport command in the Skara help even on the freshly recloned version of skara, what could go wrong?

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