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

git-pr: add csr sub-command #702

Closed
wants to merge 4 commits into from
Closed

git-pr: add csr sub-command #702

wants to merge 4 commits into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jul 9, 2020

Hi all,

please review this patch that adds the git pr csr sub-command that corresponds to the /csr pull request command. A contributor who prefers the command-line can now state that a pull request requires a CSR by running git pr csr --needed.

Testing:

  • Manual testing on Linux x64

Thanks,
Erik


Progress

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

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 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.

@edvbld
Copy link
Member Author

@edvbld edvbld commented Jul 9, 2020

/csr needed

@openjdk
Copy link

@openjdk openjdk bot commented Jul 9, 2020

@edvbld usage: /csr [unneeded], requires that the issue the pull request links to an approved CSR request.

@edvbld
Copy link
Member Author

@edvbld edvbld commented Jul 9, 2020

/csr unneeded

@openjdk
Copy link

@openjdk openjdk bot commented Jul 9, 2020

@edvbld determined that a CSR request is no longer needed for this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Jul 9, 2020

@edvbld this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout git-pr-csr
git fetch https://git.openjdk.java.net/skara master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 9, 2020

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Jul 9, 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:

git-pr: add csr sub-command

Reviewed-by: jvernee
  • 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 a39fb993bd38d94f09567e4e2fbcf4f74e9520da.

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

@openjdk openjdk bot added ready and removed merge-conflict labels Jul 9, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Jul 9, 2020

/integrate

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

@openjdk openjdk bot commented Jul 9, 2020

@edvbld
Pushed as commit bc3e59b.

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