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

316: git-webrev does not work without origin remote #517

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Mar 18, 2020

Hi all,

please review this patch that updates git-webrev to work with repositories
with slightly more unusual configurations by default. git-webrev will now by
default work with many more repositories that for example have multiple remotes,
repositories missing a remote named "origin", etc. For the most complicated
scenarios the user can now also specify --remote to pick the remote that
should be used for calculating outgoing changes.

Testing:

  • Manual testing of git-webrev on Linux x64 with some more exotic repository
    configurations

Thanks,
Erik


Progress

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

Issue

  • SKARA-316: git-webrev does not work without origin remote

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 18, 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 Mar 18, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good, just one question.

@openjdk
Copy link

@openjdk openjdk bot commented Mar 19, 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:

316: git-webrev does not work without origin remote

Reviewed-by: rwestberg
  • 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 has been 1 commit 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 d45b81619e2298510fad7d6622aae3f20baa2cc2.

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

@openjdk openjdk bot added the ready label Mar 19, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Mar 19, 2020

/integrate

@openjdk openjdk bot closed this Mar 19, 2020
@openjdk openjdk bot added integrated and removed ready labels Mar 19, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Mar 19, 2020

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

  • d45b816: 276: Merge style PRs should generate "merge" webrevs

Your commit was automatically rebased without conflicts.

Pushed as commit 42caec1.

@openjdk openjdk bot removed the rfr label Mar 19, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 19, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: 42caec1
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-03-19 08:32:35 +0000
URL: https://git.openjdk.java.net/skara/commit/42caec11

316: git-webrev does not work without origin remote

Reviewed-by: rwestberg

! cli/src/main/java/org/openjdk/skara/cli/GitWebrev.java

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