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

vcs: make follow work with merge commits #752

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Aug 29, 2020

Hi all,

please review this patch that makes ReadOnlyRepository.follow work with merge commits for Git repositories. I also added an additional unit test to verify the functionality.

Testing:

  • make test passes on Linux x64
  • Added a new unit test

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/752/head:pull/752
$ git checkout pull/752

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 29, 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.

@openjdk openjdk bot added the rfr label Aug 29, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 29, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Aug 29, 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:

vcs: make follow work with merge commits

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 /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 e954044cf92fcc4aa79a2355616b7d8e078634b0.

➡️ 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 Aug 29, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Aug 29, 2020

/integrate

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

@openjdk openjdk bot commented Aug 29, 2020

@edvbld
Pushed as commit 8a7eb77.

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